Commit a504db9e authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent c73054c5
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
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> Sat Feb 23 00:34:01 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_rows_handler): leave threads before * gtk/gtktreeview.c (validate_rows_handler): leave threads before
......
...@@ -151,7 +151,7 @@ read_line (FILE *stream, GString *str) ...@@ -151,7 +151,7 @@ read_line (FILE *stream, GString *str)
*/ */
enum { enum {
STATE_NORMAL, STATE_NORMAL,
STATE_IN_COMMENT, STATE_IN_COMMENT
}; };
static gchar *tokens[] = static gchar *tokens[] =
......
...@@ -414,7 +414,7 @@ rgb565lsb (GdkImage *image, ...@@ -414,7 +414,7 @@ rgb565lsb (GdkImage *image,
((char *) o)[0] = ((data >> 8) & 0xf8) | ((data >> 13) & 0x7); ((char *) o)[0] = ((data >> 8) & 0xf8) | ((data >> 13) & 0x7);
((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3); ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3);
((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7); ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7);
((char *) o) += 3; o = (guint16 *) (((char *) o) + 3);
++xx; ++xx;
} }
...@@ -519,7 +519,7 @@ rgb565msb (GdkImage *image, ...@@ -519,7 +519,7 @@ rgb565msb (GdkImage *image,
((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3); ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3);
((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7); ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7);
((char *) o) += 3; o = (guint16 *) (((char *) o) + 3);
++xx; ++xx;
} }
...@@ -745,7 +745,7 @@ rgb555lsb (GdkImage *image, ...@@ -745,7 +745,7 @@ rgb555lsb (GdkImage *image,
((char *) o)[0] = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12; ((char *) o)[0] = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12;
((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7; ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7;
((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2; ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2;
((char *) o) += 3; o = (guint16 *) (((char *) o) + 3);
++xx; ++xx;
} }
...@@ -845,7 +845,7 @@ rgb555msb (GdkImage *image, ...@@ -845,7 +845,7 @@ rgb555msb (GdkImage *image,
((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7; ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7;
((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2; ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2;
((char *) o) += 3; o = (guint16 *) (((char *) o) + 3);
++xx; ++xx;
} }
......
...@@ -130,7 +130,7 @@ typedef enum ...@@ -130,7 +130,7 @@ typedef enum
GDK_BUTTON5_MASK = 1 << 12, GDK_BUTTON5_MASK = 1 << 12,
/* The next few modifiers are used by XKB, so we skip to the end /* 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 GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
} GdkModifierType; } GdkModifierType;
......
...@@ -36,7 +36,7 @@ typedef enum ...@@ -36,7 +36,7 @@ typedef enum
{ {
XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_NEW,
XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_CHANGED,
XSETTINGS_ACTION_DELETED, XSETTINGS_ACTION_DELETED
} XSettingsAction; } XSettingsAction;
typedef void (*XSettingsNotifyFunc) (const char *name, typedef void (*XSettingsNotifyFunc) (const char *name,
......
...@@ -43,7 +43,7 @@ enum { ...@@ -43,7 +43,7 @@ enum {
PROP_WIDTH, PROP_WIDTH,
PROP_HEIGHT, PROP_HEIGHT,
PROP_IS_EXPANDER, PROP_IS_EXPANDER,
PROP_IS_EXPANDED, PROP_IS_EXPANDED
}; };
......
...@@ -80,7 +80,7 @@ enum { ...@@ -80,7 +80,7 @@ enum {
PROP_HAS_PALETTE, PROP_HAS_PALETTE,
PROP_HAS_OPACITY_CONTROL, PROP_HAS_OPACITY_CONTROL,
PROP_CURRENT_COLOR, PROP_CURRENT_COLOR,
PROP_CURRENT_ALPHA, PROP_CURRENT_ALPHA
}; };
enum { enum {
......
...@@ -51,7 +51,7 @@ enum { ...@@ -51,7 +51,7 @@ enum {
PROP_0, PROP_0,
PROP_BORDER_WIDTH, PROP_BORDER_WIDTH,
PROP_RESIZE_MODE, PROP_RESIZE_MODE,
PROP_CHILD, PROP_CHILD
}; };
#define PARAM_SPEC_PARAM_ID(pspec) ((pspec)->param_id) #define PARAM_SPEC_PARAM_ID(pspec) ((pspec)->param_id)
......
...@@ -38,7 +38,7 @@ enum { ...@@ -38,7 +38,7 @@ enum {
}; };
enum { enum {
PROP_0, PROP_0,
PROP_USER_DATA, PROP_USER_DATA
}; };
......
...@@ -1260,7 +1260,7 @@ gtk_paned_move_handle (GtkPaned *paned, ...@@ -1260,7 +1260,7 @@ gtk_paned_move_handle (GtkPaned *paned,
enum { enum {
SINGLE_STEP_SIZE = 1, SINGLE_STEP_SIZE = 1,
PAGE_STEP_SIZE = 75, PAGE_STEP_SIZE = 75
}; };
old_position = gtk_paned_get_position (paned); old_position = gtk_paned_get_position (paned);
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
enum { enum {
PROP_0, PROP_0,
PROP_ORIENTATION, PROP_ORIENTATION,
PROP_TOOLBAR_STYLE, PROP_TOOLBAR_STYLE
}; };
enum { enum {
......
...@@ -122,7 +122,7 @@ enum { ...@@ -122,7 +122,7 @@ enum {
PROP_REORDERABLE, PROP_REORDERABLE,
PROP_RULES_HINT, PROP_RULES_HINT,
PROP_ENABLE_SEARCH, PROP_ENABLE_SEARCH,
PROP_SEARCH_COLUMN, PROP_SEARCH_COLUMN
}; };
static void gtk_tree_view_class_init (GtkTreeViewClass *klass); static void gtk_tree_view_class_init (GtkTreeViewClass *klass);
......
...@@ -82,7 +82,7 @@ struct _GtkWindow ...@@ -82,7 +82,7 @@ struct _GtkWindow
guint need_default_position : 1; guint need_default_position : 1;
guint need_default_size : 1; guint need_default_size : 1;
guint position : 3; guint position : 3;
GtkWindowType type : 4; guint type : 4; /* GtkWindowType */
guint has_user_ref_count : 1; guint has_user_ref_count : 1;
guint has_focus : 1; guint has_focus : 1;
...@@ -97,8 +97,8 @@ struct _GtkWindow ...@@ -97,8 +97,8 @@ struct _GtkWindow
guint maximize_initially : 1; guint maximize_initially : 1;
guint decorated : 1; guint decorated : 1;
GdkWindowTypeHint type_hint : 3; guint type_hint : 3; /* GdkWindowTypeHint */
GdkGravity gravity : 5; guint gravity : 5; /* GdkGravity */
guint frame_left; guint frame_left;
guint frame_top; guint frame_top;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment