Error building control-center

[Carson Gaspar <carson+garnome taltos org>]

gcc is the current gcc 3.4.0 snapshot. This _does_ work with gcc-3.3

make[5]: Entering directory 
`/local/cag/garnome-2.5.92/desktop/control-center/work/main.d/control-cente
r-2.5.4/capplets/keybindings'
/local/garnome/bin/gcc -DHAVE_CONFIG_H -I. -I. -I../.. -DORBIT2=1 -pthread 
-I/local/garnome/include/gtk-2.0 -I/local/garnome/lib/gtk-2.0/include 
-I/local/garnome/include/atk-1.0 -I/local/garnome/include/pango-1.0 
-I/local/garnome/include -I/local/garnome/include/freetype2 
-I/local/garnome/include/glib-2.0 -I/local/garnome/lib/glib-2.0/include 
-I/local/garnome/include/gconf/2 -I/local/garnome/include/orbit-2.0 
-I/local/garnome/include/libgnomeui-2.0 
-I/local/garnome/include/libgnome-2.0 
-I/local/garnome/include/libgnomecanvas-2.0 
-I/local/garnome/include/libart-2.0 
-I/local/garnome/include/libbonoboui-2.0 
-I/local/garnome/include/libbonobo-2.0 
-I/local/garnome/include/gnome-vfs-2.0 
-I/local/garnome/lib/gnome-vfs-2.0/include 
-I/local/garnome/include/bonobo-activation-2.0 
-I/local/garnome/include/libxml2 -I/local/garnome/include/libglade-2.0 
-I/local/garnome/include/gnome-desktop-2.0 
-I/local/garnome/include/startup-notification-1.0   -I../../ 
-DG_LOG_DOMAIN="\"-properties\"" 
-DGNOMELOCALEDIR="\"/local/garnome/share/locale\"" -I../../capplets/common 
-I/local/garnome/include  -g -I/local/garnome/include -O3 -march=pentium3 
-mtune=pentium4 -mmmx -msse -mfpmath=sse -pipe -Wall -c 
eggcellrendererkeys.c
eggcellrendererkeys.c:624: error: conflicting types for 
'egg_cell_renderer_keys_set_accelerator'
eggcellrendererkeys.h:78: error: previous declaration of 
'egg_cell_renderer_keys_set_accelerator' was here
eggcellrendererkeys.c:624: error: conflicting types for 
'egg_cell_renderer_keys_set_accelerator'
eggcellrendererkeys.h:78: error: previous declaration of 
'egg_cell_renderer_keys_set_accelerator' was here
eggcellrendererkeys.c:674: error: conflicting types for 
'egg_cell_renderer_keys_get_accelerator'
eggcellrendererkeys.h:81: error: previous declaration of 
'egg_cell_renderer_keys_get_accelerator' was here
eggcellrendererkeys.c:674: error: conflicting types for 
'egg_cell_renderer_keys_get_accelerator'
eggcellrendererkeys.h:81: error: previous declaration of 
'egg_cell_renderer_keys_get_accelerator' was here
make[5]: *** [eggcellrendererkeys.o] Error 1

Given:

typedef enum
{
 GDK_SHIFT_MASK    = 1 << 0,
 GDK_LOCK_MASK     = 1 << 1,
 GDK_CONTROL_MASK  = 1 << 2,
 GDK_MOD1_MASK     = 1 << 3,
 GDK_MOD2_MASK     = 1 << 4,
 GDK_MOD3_MASK     = 1 << 5,
 GDK_MOD4_MASK     = 1 << 6,
 GDK_MOD5_MASK     = 1 << 7,
 GDK_BUTTON1_MASK  = 1 << 8,
 GDK_BUTTON2_MASK  = 1 << 9,
 GDK_BUTTON3_MASK  = 1 << 10,
 GDK_BUTTON4_MASK  = 1 << 11,
 GDK_BUTTON5_MASK  = 1 << 12,
 /* The next few modifiers are used by XKB, so we skip to the end
  */
 GDK_RELEASE_MASK  = 1 << 30,
 GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
} GdkModifierType;

typedef enum
{
 EGG_VIRTUAL_SHIFT_MASK    = 1 << 0,
 EGG_VIRTUAL_LOCK_MASK     = 1 << 1,
 EGG_VIRTUAL_CONTROL_MASK  = 1 << 2,


 EGG_VIRTUAL_ALT_MASK      = 1 << 3, /* fixed as Mod1 */


 EGG_VIRTUAL_MOD2_MASK     = 1 << 4,
 EGG_VIRTUAL_MOD3_MASK     = 1 << 5,
 EGG_VIRTUAL_MOD4_MASK     = 1 << 6,
 EGG_VIRTUAL_MOD5_MASK     = 1 << 7,


#if 0
 GDK_BUTTON1_MASK  = 1 << 8,
 GDK_BUTTON2_MASK  = 1 << 9,
 GDK_BUTTON3_MASK  = 1 << 10,
 GDK_BUTTON4_MASK  = 1 << 11,
 GDK_BUTTON5_MASK  = 1 << 12,
 /* 13, 14 are used by Xkb for the keyboard group */
#endif


 EGG_VIRTUAL_META_MASK = 1 << 24,
 EGG_VIRTUAL_SUPER_MASK = 1 << 25,
 EGG_VIRTUAL_HYPER_MASK = 1 << 26,
 EGG_VIRTUAL_MODE_SWITCH_MASK = 1 << 27,
 EGG_VIRTUAL_NUM_LOCK_MASK = 1 << 28,
 EGG_VIRTUAL_SCROLL_LOCK_MASK = 1 << 29,


 /* Also in GdkModifierType */
 EGG_VIRTUAL_RELEASE_MASK  = 1 << 30,


 /*     28-31 24-27 20-23 16-19 12-15 8-11 4-7 0-3
  *       7     f     0     0     0    0    f   f
  */
 EGG_VIRTUAL_MODIFIER_MASK = 0x7f0000ff


} EggVirtualModifierType;

I'd have to agree that this is bogus code. A simple patch (attached) making 
the prototypes and the code agree fixes the problem.

--
Carson

Attachment: eggcellrenderkeys.patch
Description: Binary data