diff options
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 20 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 20 | ||||
-rw-r--r-- | demos/gtk-demo/main.c | 2 | ||||
-rw-r--r-- | gdk/gdkpixbuf-drawable.c | 8 | ||||
-rw-r--r-- | gdk/gdktypes.h | 2 | ||||
-rw-r--r-- | gdk/x11/xsettings-client.h | 2 | ||||
-rw-r--r-- | gtk/gtkcellrenderer.c | 2 | ||||
-rw-r--r-- | gtk/gtkcolorsel.c | 2 | ||||
-rw-r--r-- | gtk/gtkcontainer.c | 2 | ||||
-rw-r--r-- | gtk/gtkobject.c | 2 | ||||
-rw-r--r-- | gtk/gtkpaned.c | 2 | ||||
-rw-r--r-- | gtk/gtktoolbar.c | 2 | ||||
-rw-r--r-- | gtk/gtktreeview.c | 2 | ||||
-rw-r--r-- | gtk/gtkwindow.h | 6 |
19 files changed, 157 insertions, 17 deletions
@@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e5410f7a11..a65d0bc235 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +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. + Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (validate_rows_handler): leave threads before diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index c59bf3184a..6f1a4abe18 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -151,7 +151,7 @@ read_line (FILE *stream, GString *str) */ enum { STATE_NORMAL, - STATE_IN_COMMENT, + STATE_IN_COMMENT }; static gchar *tokens[] = 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, diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index f2cdb9cf2d..8b13966226 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -43,7 +43,7 @@ enum { PROP_WIDTH, PROP_HEIGHT, PROP_IS_EXPANDER, - PROP_IS_EXPANDED, + PROP_IS_EXPANDED }; diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 0a7f2d9f2e..c47164634c 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -80,7 +80,7 @@ enum { PROP_HAS_PALETTE, PROP_HAS_OPACITY_CONTROL, PROP_CURRENT_COLOR, - PROP_CURRENT_ALPHA, + PROP_CURRENT_ALPHA }; enum { diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index b03a068a78..3065da386b 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -51,7 +51,7 @@ enum { PROP_0, PROP_BORDER_WIDTH, PROP_RESIZE_MODE, - PROP_CHILD, + PROP_CHILD }; #define PARAM_SPEC_PARAM_ID(pspec) ((pspec)->param_id) diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index e20680a4d0..7af316c066 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -38,7 +38,7 @@ enum { }; enum { PROP_0, - PROP_USER_DATA, + PROP_USER_DATA }; diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 85098727c9..bf15fd2f01 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -1260,7 +1260,7 @@ gtk_paned_move_handle (GtkPaned *paned, enum { SINGLE_STEP_SIZE = 1, - PAGE_STEP_SIZE = 75, + PAGE_STEP_SIZE = 75 }; old_position = gtk_paned_get_position (paned); diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 5517417bf8..ac6d1d14b7 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -53,7 +53,7 @@ enum { PROP_0, PROP_ORIENTATION, - PROP_TOOLBAR_STYLE, + PROP_TOOLBAR_STYLE }; enum { diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 282b1a6c49..f8c3ac6e0a 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -122,7 +122,7 @@ enum { PROP_REORDERABLE, PROP_RULES_HINT, PROP_ENABLE_SEARCH, - PROP_SEARCH_COLUMN, + PROP_SEARCH_COLUMN }; static void gtk_tree_view_class_init (GtkTreeViewClass *klass); diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 329fcdc442..393e028495 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -82,7 +82,7 @@ struct _GtkWindow guint need_default_position : 1; guint need_default_size : 1; guint position : 3; - GtkWindowType type : 4; + guint type : 4; /* GtkWindowType */ guint has_user_ref_count : 1; guint has_focus : 1; @@ -97,8 +97,8 @@ struct _GtkWindow guint maximize_initially : 1; guint decorated : 1; - GdkWindowTypeHint type_hint : 3; - GdkGravity gravity : 5; + guint type_hint : 3; /* GdkWindowTypeHint */ + guint gravity : 5; /* GdkGravity */ guint frame_left; guint frame_top; |