diff --git a/ChangeLog b/ChangeLog index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 26ea7eb63a..a011656fc4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Sat Jan 19 08:47:41 2002 Jeff Garzik + + * gdk/linux-fb/gdkproperty-fb.c (gdk_atom_name): + Wrap case values in GPOINTER_TO_UINT(). Fixes build with gcc 3.x. + + * gtk/gtkmain.c: Include sys/types.h if G_OS_UNIX. + Fixes build with gcc 3.x and -ansi. + Fri Jan 18 23:01:37 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_parse_style): Fix problems when diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c index 2de5e9cfa0..70c3fb8222 100644 --- a/gdk/linux-fb/gdkproperty-fb.c +++ b/gdk/linux-fb/gdkproperty-fb.c @@ -72,17 +72,28 @@ gdk_atom_name (GdkAtom atom) switch (GPOINTER_TO_UINT (atom)) { - case GDK_SELECTION_PRIMARY: return g_strdup ("PRIMARY"); - case GDK_SELECTION_SECONDARY: return g_strdup ("SECONDARY"); - case GDK_SELECTION_CLIPBOARD: return g_strdup ("CLIPBOARD"); - case GDK_SELECTION_TYPE_ATOM: return g_strdup ("ATOM"); - case GDK_SELECTION_TYPE_BITMAP: return g_strdup ("BITMAP"); - case GDK_SELECTION_TYPE_COLORMAP: return g_strdup ("COLORMAP"); - case GDK_SELECTION_TYPE_DRAWABLE: return g_strdup ("DRAWABLE"); - case GDK_SELECTION_TYPE_INTEGER: return g_strdup ("INTEGER"); - case GDK_SELECTION_TYPE_PIXMAP: return g_strdup ("PIXMAP"); - case GDK_SELECTION_TYPE_WINDOW: return g_strdup ("WINDOW"); - case GDK_SELECTION_TYPE_STRING: return g_strdup ("STRING"); + case GPOINTER_TO_UINT (GDK_SELECTION_PRIMARY): + return g_strdup ("PRIMARY"); + case GPOINTER_TO_UINT (GDK_SELECTION_SECONDARY): + return g_strdup ("SECONDARY"); + case GPOINTER_TO_UINT (GDK_SELECTION_CLIPBOARD): + return g_strdup ("CLIPBOARD"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_ATOM): + return g_strdup ("ATOM"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_BITMAP): + return g_strdup ("BITMAP"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_COLORMAP): + return g_strdup ("COLORMAP"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_DRAWABLE): + return g_strdup ("DRAWABLE"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_INTEGER): + return g_strdup ("INTEGER"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_PIXMAP): + return g_strdup ("PIXMAP"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_WINDOW): + return g_strdup ("WINDOW"); + case GPOINTER_TO_UINT (GDK_SELECTION_TYPE_STRING): + return g_strdup ("STRING"); default: g_warning (G_STRLOC "Invalid atom"); return g_strdup (""); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 0c44b58c8a..b178bd929e 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -38,6 +38,7 @@ #include #ifdef G_OS_UNIX #include +#include /* For uid_t, gid_t */ #endif #ifdef G_OS_WIN32 #define STRICT