From 8eb36ebbd560a048814890dd652449aac97e85ed Mon Sep 17 00:00:00 2001 From: Shawn Amundson Date: Sat, 3 Jan 1998 05:46:58 +0000 Subject: [PATCH] Several portability fixes from Michael Callahan * Several portability fixes from Michael Callahan including adding in missing #includes and adding void in function prototypes. -Shawn --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/gdk.c | 1 + gdk/gdktypes.h | 2 +- gdk/x11/gdkmain-x11.c | 1 + gtk/gtkbutton.c | 1 + gtk/gtkcurve.c | 1 + gtk/gtkfixed.h | 2 +- gtk/gtkframe.c | 1 + gtk/gtkhandlebox.c | 1 + gtk/gtkhpaned.h | 2 +- gtk/gtkinputdialog.h | 2 +- gtk/gtktypeutils.c | 4 ++-- gtk/testselection.c | 3 ++- tests/testselection.c | 3 ++- 20 files changed, 58 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4bfafa7d7..2ade9d7f4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Jan 2 23:55:24 CST 1998 Shawn T. Amundson + + * Several portability fixes from Michael Callahan + including adding in missing + #includes and adding void in function prototypes. + Fri Jan 2 19:28:52 1988 Jay Painter * gtk/gtkclist.h: * gtk/gtkclist.c: diff --git a/gdk/gdk.c b/gdk/gdk.c index 782037324..4857bcc1f 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -2233,6 +2233,7 @@ gdk_event_translate (GdkEvent *event, return_val = window_private && !window_private->destroyed; break; default: + ; } break; diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index a4ebe6501..96398c3fc 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -197,7 +197,7 @@ typedef enum GDK_WA_COLORMAP = 1 << 5, GDK_WA_VISUAL = 1 << 6, GDK_WA_WMCLASS = 1 << 7, - GDK_WA_NOREDIR = 1 << 8, + GDK_WA_NOREDIR = 1 << 8 } GdkWindowAttributesType; /* Size restriction enumeration. diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 782037324..4857bcc1f 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -2233,6 +2233,7 @@ gdk_event_translate (GdkEvent *event, return_val = window_private && !window_private->destroyed; break; default: + ; } break; diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 18afb177a..39fc468b7 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "gtkbutton.h" #include "gtklabel.h" #include "gtkmain.h" diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index 93efd1015..e71785c5a 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index ee9c131a0..08fb9969f 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -58,7 +58,7 @@ struct _GtkFixedChild guint gtk_fixed_get_type (void); -GtkWidget* gtk_fixed_new (); +GtkWidget* gtk_fixed_new (void); void gtk_fixed_put (GtkFixed *fixed, GtkWidget *widget, gint16 x, diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index a3160307e..ad01a879f 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "gtkframe.h" diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 180c58fa5..82735d70a 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "gtksignal.h" #include "gtkhandlebox.h" #include diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index 0a352e799..0903891fc 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -48,7 +48,7 @@ struct _GtkHPanedClass guint gtk_hpaned_get_type (void); -GtkWidget* gtk_hpaned_new (); +GtkWidget* gtk_hpaned_new (void); #ifdef __cplusplus diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index 80a900090..69146836f 100644 --- a/gtk/gtkinputdialog.h +++ b/gtk/gtkinputdialog.h @@ -68,7 +68,7 @@ struct _GtkInputDialogClass guint gtk_input_dialog_get_type (void); -GtkWidget* gtk_input_dialog_new (); +GtkWidget* gtk_input_dialog_new (void); #ifdef __cplusplus diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index 46e035fd9..ffde61647 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -45,7 +45,7 @@ static gint gtk_type_compare (GtkType *a, static guint gtk_type_name_hash (const char *key); static gint gtk_type_name_compare (const char *a, const char *b); -static void gtk_type_init_builtin_types (); +static void gtk_type_init_builtin_types (void); static int initialize = TRUE; @@ -395,7 +395,7 @@ gtk_type_register_builtin (char *name, return gtk_type_unique (parent, &info); } -extern void gtk_object_init_type (); +extern void gtk_object_init_type (void); GtkType gtk_type_builtins[GTK_TYPE_NUM_BUILTINS]; diff --git a/gtk/testselection.c b/gtk/testselection.c index 6f33be989..15ea22573 100644 --- a/gtk/testselection.c +++ b/gtk/testselection.c @@ -16,6 +16,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "gtk.h" typedef enum { @@ -35,7 +36,7 @@ typedef enum { STRING, TEXT, WINDOW, - LAST_SEL_TYPE, + LAST_SEL_TYPE } SelType; GdkAtom seltypes[LAST_SEL_TYPE]; diff --git a/tests/testselection.c b/tests/testselection.c index 6f33be989..15ea22573 100644 --- a/tests/testselection.c +++ b/tests/testselection.c @@ -16,6 +16,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "gtk.h" typedef enum { @@ -35,7 +36,7 @@ typedef enum { STRING, TEXT, WINDOW, - LAST_SEL_TYPE, + LAST_SEL_TYPE } SelType; GdkAtom seltypes[LAST_SEL_TYPE];