Added check for inline in configure and updated files to use it.

-Yosh

12 files changed, 100 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 04f0b17b44..b0617723ab 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Thu Jan  8 17:56:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib/gscanner.c
+	* gtk/gtclist.c
+	* config.h.in
+	* configure.in: added test for inline and put the inline keywords
+	back in
+
+	* gtk/gtklabel.c: made the prototypes match the definitions
+
+	* gtk/fnmatch.c: minor change to make sure the right config.h
+	gets included
+	
 1998-01-07  Elliot Lee  <sopwith@localhost.cs.cuc.edu>
 
 	* gtk/gtkcombobox.c gtk/gtkcombobox.h: New widget, GtkComboBox
diff --git a/config.h.in b/config.h.in
index 37fc8e5748..5e547ec4d9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@
 /* Define to empty if the keyword does not work.  */
 #undef const
 
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
diff --git a/configure.in b/configure.in
index 4f9fe3bbab..e4752ebee2 100644
--- a/configure.in
+++ b/configure.in
@@ -231,6 +231,7 @@ AC_HEADER_STDC
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_INLINE
 
 # Checks for library functions.
 AC_TYPE_SIGNAL
diff --git a/glib/gscanner.c b/glib/gscanner.c
index e35899d219..35b81b7f8c 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -110,7 +110,8 @@ static	void	g_scanner_get_token_i	(GScanner	*scanner,
 static	void	g_scanner_free_value	(GTokenType	*token_p,
 					 GValue		*value_p);
 
-static  gint	g_scanner_char_2_num	(guchar		c,
+static	inline
+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/fnmatch.c b/gtk/fnmatch.c
index f92beb6f1b..b33b0bc431 100644
--- a/gtk/fnmatch.c
+++ b/gtk/fnmatch.c
@@ -16,7 +16,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "../config.h"
 #endif
 
 #include <errno.h>
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 0023061a02..001b750cdb 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -17,6 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <stdlib.h>
+#include "../config.h"
 #include "gtkclist.h"
 
 /* the width of the column resize windows */
@@ -50,7 +51,7 @@
 
 /* returns the column index from a x pixel location in the 
  * context of the clist's hoffset */
-static gint
+static inline gint
 COLUMN_FROM_XPIXEL (GtkCList * clist,
 		    gint x)
 {