diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-23 00:13:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-23 00:13:17 +0000 |
| commit | a504db9e83bb022aaaa6d265481fc2bb376e87df (patch) | |
| tree | e116ba25c324cea2e10b22f1c15fd37b17d7c43a /gdk | |
| parent | c73054c5a952c12a2a1429d9cd464266e8b23e36 (diff) | |
| download | gtk+-a504db9e83bb022aaaa6d265481fc2bb376e87df.tar.gz | |
Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann, #72182.
Fri Feb 22 18:36:45 2002 Owen Taylor <otaylor@redhat.com>
Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
#72182.
* demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c
gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
Squash trailing commas on enumerations.
* gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
of 1 << 31 to work around AIX compiler problem. (C standard
seems to imply that compiler is required to use an unsigned
type for the enum value in this case.)
* gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
* gtk/gtkwindow.h: Fix use of enum types for bitfields ...
compilers may choose to use a signed type for bitfields.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkpixbuf-drawable.c | 8 | ||||
| -rw-r--r-- | gdk/gdktypes.h | 2 | ||||
| -rw-r--r-- | gdk/x11/xsettings-client.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index 2926b5834d..0a15d98fc3 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -414,7 +414,7 @@ rgb565lsb (GdkImage *image, ((char *) o)[0] = ((data >> 8) & 0xf8) | ((data >> 13) & 0x7); ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3); ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7); - ((char *) o) += 3; + o = (guint16 *) (((char *) o) + 3); ++xx; } @@ -519,7 +519,7 @@ rgb565msb (GdkImage *image, ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3); ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7); - ((char *) o) += 3; + o = (guint16 *) (((char *) o) + 3); ++xx; } @@ -745,7 +745,7 @@ rgb555lsb (GdkImage *image, ((char *) o)[0] = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12; ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7; ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2; - ((char *) o) += 3; + o = (guint16 *) (((char *) o) + 3); ++xx; } @@ -845,7 +845,7 @@ rgb555msb (GdkImage *image, ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7; ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2; - ((char *) o) += 3; + o = (guint16 *) (((char *) o) + 3); ++xx; } diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 212c366dd0..5023ef0f3a 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -130,7 +130,7 @@ typedef enum GDK_BUTTON5_MASK = 1 << 12, /* The next few modifiers are used by XKB, so we skip to the end */ - GDK_RELEASE_MASK = 1u << 31, + GDK_RELEASE_MASK = 1 << 30, GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff } GdkModifierType; diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h index 12018295fb..1b13fe3bba 100644 --- a/gdk/x11/xsettings-client.h +++ b/gdk/x11/xsettings-client.h @@ -36,7 +36,7 @@ typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, - XSETTINGS_ACTION_DELETED, + XSETTINGS_ACTION_DELETED } XSettingsAction; typedef void (*XSettingsNotifyFunc) (const char *name, |