wayland doesn't build anymore

[twied]

seems like the scanner needs to generate a wayland-common-protocol.h

tim


   CC     compositor-wayland.o
In file included from ../wayland/wayland-server.h:32,
                  from compositor.h:25,
                  from compositor-wayland.c:40:
../wayland/wayland-server-protocol.h:122: error: nested redefinition of ‘enum wl_shell_resize’
../wayland/wayland-server-protocol.h:122: error: redeclaration of ‘enum wl_shell_resize’
../wayland/wayland-server-protocol.h:123: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_NONE’
../wayland/wayland-client-protocol.h:335: note: previous definition of ‘WL_SHELL_RESIZE_NONE’ was here
../wayland/wayland-server-protocol.h:124: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_TOP’
../wayland/wayland-client-protocol.h:336: note: previous definition of ‘WL_SHELL_RESIZE_TOP’ was here
../wayland/wayland-server-protocol.h:125: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_BOTTOM’
../wayland/wayland-client-protocol.h:337: note: previous definition of ‘WL_SHELL_RESIZE_BOTTOM’ was here
../wayland/wayland-server-protocol.h:126: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_LEFT’
../wayland/wayland-client-protocol.h:338: note: previous definition of ‘WL_SHELL_RESIZE_LEFT’ was here
../wayland/wayland-server-protocol.h:127: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_TOP_LEFT’
../wayland/wayland-client-protocol.h:339: note: previous definition of ‘WL_SHELL_RESIZE_TOP_LEFT’ was here
../wayland/wayland-server-protocol.h:128: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_BOTTOM_LEFT’
../wayland/wayland-client-protocol.h:340: note: previous definition of ‘WL_SHELL_RESIZE_BOTTOM_LEFT’ was here
../wayland/wayland-server-protocol.h:129: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_RIGHT’
../wayland/wayland-client-protocol.h:341: note: previous definition of ‘WL_SHELL_RESIZE_RIGHT’ was here
../wayland/wayland-server-protocol.h:130: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_TOP_RIGHT’
../wayland/wayland-client-protocol.h:342: note: previous definition of ‘WL_SHELL_RESIZE_TOP_RIGHT’ was here
../wayland/wayland-server-protocol.h:131: error: redeclaration of enumerator ‘WL_SHELL_RESIZE_BOTTOM_RIGHT’
../wayland/wayland-client-protocol.h:343: note: previous definition of ‘WL_SHELL_RESIZE_BOTTOM_RIGHT’ was here


git bisect:


027931bd33e6bda30a701be5dd1c33f01bb8b038 is the first bad commit
commit 027931bd33e6bda30a701be5dd1c33f01bb8b038
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Jan 21 21:57:55 2011 -0500

     Define the shell resize enumeration in the xml spec