Removal of inlines, and updated ChangeLog. -Jay

9 files changed, 45 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2ade9d7f4..d5de96b7c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Jay  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+	* reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack
+	* gtk/gtkclist.c:
+	* glib/gscanner.c: removed inlines from clist and gscanner
+
 Fri Jan  2 23:55:24 CST 1998 Shawn T. Amundson <amundson@gimp.org>
 
 	* Several portability fixes from Michael Callahan 
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 254affec2..e35899d21 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -110,8 +110,7 @@ static	void	g_scanner_get_token_i	(GScanner	*scanner,
 static	void	g_scanner_free_value	(GTokenType	*token_p,
 					 GValue		*value_p);
 
-static	__inline__
-gint		g_scanner_char_2_num	(guchar		c,
+static  gint	g_scanner_char_2_num	(guchar		c,
 					 guchar		base);
 static	guchar	g_scanner_peek_next_char(GScanner	*scanner);
 static	guchar	g_scanner_get_char	(GScanner	*scanner,
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index e5b06ee1d..b48d2d5b7 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -50,7 +50,7 @@
 
 /* returns the column index from a x pixel location in the 
  * context of the clist's hoffset */
-static inline gint
+static gint
 COLUMN_FROM_XPIXEL (GtkCList * clist,
 		    gint x)
 {
@@ -518,7 +518,7 @@ gtk_clist_set_column_title (GtkCList * clist,
 			    gchar * title)
 {
   GtkWidget *old_widget;
-  GtkWidget *alignment;
+  GtkWidget *alignment = NULL;
   GtkWidget *label;
 
   g_return_if_fail (clist != NULL);
@@ -553,9 +553,6 @@ gtk_clist_set_column_title (GtkCList * clist,
     case GTK_JUSTIFY_FILL:
       alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
       break;
-
-    default:
-      break;
     }
 
   if (alignment)