Patch from Sven Neumann to make the include order consistent. (#71704)

Tue Dec  3 20:22:27 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/*.c: Patch from Sven Neumann to make the
        include order consistent. (#71704)

43 files changed, 111 insertions, 85 deletions

diff --git a/glib/garray.c b/glib/garray.c
index 260ef64b4..02e3d31c4 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
index d9e6489cd..071dedb88 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -24,8 +24,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 struct _GAsyncQueue
 {
   GMutex *mutex;
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 24e9a9ece..e4b3fdba3 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -29,9 +29,7 @@
  * then
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <signal.h>
 #include <stdarg.h>
diff --git a/glib/gbsearcharray.c b/glib/gbsearcharray.c
index a9891eca0..3b50bdecd 100644
--- a/glib/gbsearcharray.c
+++ b/glib/gbsearcharray.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #define G_IMPLEMENT_INLINES 1
 #define __G_BSEARCHARRAY_C__
diff --git a/glib/gcache.c b/glib/gcache.c
index 12e99a66b..a462b0275 100644
--- a/glib/gcache.c
+++ b/glib/gcache.c
@@ -28,6 +28,8 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
 
diff --git a/glib/gcompletion.c b/glib/gcompletion.c
index 702cb3320..2cfa40aca 100644
--- a/glib/gcompletion.c
+++ b/glib/gcompletion.c
@@ -28,9 +28,13 @@
  * MT safe
  */
 
-#include "glib.h"
+#include "config.h"
+
 #include <string.h>
 
+#include "glib.h"
+
+
 static void completion_check_cache (GCompletion* cmp,
 				    gchar**	 new_prefix);
 
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 4de433a75..03939f39d 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <iconv.h>
 #include <errno.h>
diff --git a/glib/gdataset.c b/glib/gdataset.c
index 7d8d9afd4..fc0a92b42 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -31,9 +31,11 @@
  * looked at yet.  
  */
 
-#include        <string.h>
-#include	"glib.h"
+#include "config.h"
 
+#include <string.h>
+
+#include "glib.h"
 
 
 /* --- defines --- */
diff --git a/glib/gdate.c b/glib/gdate.c
index bfbb714c2..9153a0ac7 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -28,15 +28,13 @@
  * MT safe
  */
 
+#include "config.h"
+
 #define DEBUG_MSG(x)	/* */
 #ifdef G_ENABLE_DEBUG
 /* #define DEBUG_MSG(args)	g_message args ; */
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "glib.h"
 
 #include <time.h>
diff --git a/glib/gerror.c b/glib/gerror.c
index 664aa2420..bd6a34b5d 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -24,8 +24,11 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 static GError* 
 g_error_new_valist(GQuark         domain,
                    gint           code,
diff --git a/glib/ghash.c b/glib/ghash.c
index 05120610e..a2653f333 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/ghook.c b/glib/ghook.c
index d2b0fcdb4..b1545a0e2 100644
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -31,7 +31,9 @@
  * MT safe
  */
 
-#include	"glib.h"
+#include "config.h"
+
+#include "glib.h"
 
 
 /* --- defines --- */
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 3091375d8..68ed280ef 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -32,7 +32,6 @@
  */
 
 #include "config.h"
-#include "giochannel.h"
 
 #include <string.h>
 #include <errno.h>
@@ -45,6 +44,8 @@
 
 #include "glib.h"
 
+#include "giochannel.h"
+
 #include "glibintl.h"
 
 #define G_IO_NICE_BUF_SIZE	1024
diff --git a/glib/giounix.c b/glib/giounix.c
index d347de5b2..29d29fb23 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include "glib.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -42,6 +41,8 @@
 #include <string.h>
 #include <fcntl.h>
 
+#include "glib.h"
+
 /*
  * Unix IO Channels
  */
diff --git a/glib/glist.c b/glib/glist.c
index 3935cb1b1..983851909 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 4b2e78384..a45952e7a 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -18,15 +18,15 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
-
-#include "glib.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
+#include "glib.h"
+
 #include "glibintl.h"
 
 GQuark
diff --git a/glib/gmem.c b/glib/gmem.c
index 5d3a13a5c..22445a864 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -28,13 +28,12 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+
 #include "glib.h"
 
 
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 0fb2358a7..820c3eeb8 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -28,21 +28,20 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include "glib.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <signal.h>
 #include <locale.h>
 #include <errno.h>
+
+#include "glib.h"
 #include "gdebug.h"
 #include "gprintfint.h"
 
diff --git a/glib/gnode.c b/glib/gnode.c
index a6888fe1c..c31a1804e 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -31,9 +31,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/gpattern.c b/glib/gpattern.c
index 924998080..302c6f757 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.c
@@ -16,6 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#include "config.h"
+
+#include <string.h>
+
 #include "gpattern.h"
 
 #include "gmacros.h"
@@ -23,7 +28,6 @@
 #include "gmem.h"
 #include "gunicode.h"
 #include "gutils.h" 
-#include <string.h>
 
 /* keep enum and structure of gpattern.c and patterntest.c in sync */
 typedef enum
diff --git a/glib/gprimes.c b/glib/gprimes.c
index 0d63bb76c..439c1c89e 100644
--- a/glib/gprimes.c
+++ b/glib/gprimes.c
@@ -28,8 +28,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 static const guint g_primes[] =
 {
   11,
diff --git a/glib/gqsort.c b/glib/gqsort.c
index 5dcb4bf07..8c9314c79 100644
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -32,10 +32,13 @@
  * at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include "glib.h"
 
+
 /* Byte-wise swap two items of size SIZE. */
 #define SWAP(a, b, size)						      \
   do									      \
diff --git a/glib/gqueue.c b/glib/gqueue.c
index 9db4d5c8b..debbfa05a 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -24,9 +24,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/grand.c b/glib/grand.c
index 36d53ff4a..f328878d5 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -36,10 +36,14 @@
  * MT safe
  */
 
-#include <glib.h>
+#include "config.h"
+
 #include <math.h>
 #include <stdio.h>
 
+#include "glib.h"
+
+
 G_LOCK_DEFINE_STATIC (global_random);
 static GRand* global_random = NULL;
 
diff --git a/glib/grel.c b/glib/grel.c
index 92cd82262..d45deb641 100644
--- a/glib/grel.c
+++ b/glib/grel.c
@@ -27,10 +27,14 @@
  * MT safe
  */
 
-#include "glib.h"
+#include "config.h"
+
 #include <stdarg.h>
 #include <string.h>
 
+#include "glib.h"
+
+
 typedef struct _GRealTuples        GRealTuples;
 
 struct _GRelation
diff --git a/glib/gscanner.c b/glib/gscanner.c
index d1fb24547..790241a70 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -31,24 +31,23 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
+#include	<errno.h>
 #include	<stdlib.h>
 #include	<stdarg.h>
 #include	<string.h>
 #include	<stdio.h>
-#include	"glib.h"
-#include	"gprintfint.h"
 #ifdef HAVE_UNISTD_H
 #include	<unistd.h>
 #endif
-#include	<errno.h>
 #ifdef G_OS_WIN32
 #include	<io.h>		/* For _read() */
 #endif
 
+#include	"glib.h"
+#include	"gprintfint.h"
+
 /* --- defines --- */
 #define	to_lower(c)				( \
 	(guchar) (							\
diff --git a/glib/gshell.c b/glib/gshell.c
index 08318fd91..b6e5b5227 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -20,11 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "glib.h"
 #include <string.h>
 
+#include "glib.h"
+
 #ifdef _
 #warning "FIXME remove gettext hack"
 #endif
diff --git a/glib/gslist.c b/glib/gslist.c
index 18e08e42d..4cac78fbc 100644
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index a289f059f..18a398e92 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -19,11 +19,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #undef G_LOG_DOMAIN
 #include "glib.h"
 #define GSPAWN_HELPER
 #include "gspawn-win32.c"	/* For shared definitions */
 
+
 static GString *debugstring;
 
 static void
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 3950063db..ab6eb2da7 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -39,6 +39,8 @@
 
 #include <config.h>
 
+#include "config.h"
+
 #include "glib.h"
 #include "gprintfint.h"
 
diff --git a/glib/gspawn.c b/glib/gspawn.c
index b360871db..165d99586 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -20,9 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "glib.h"
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -36,6 +35,8 @@
 #include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
 
+#include "glib.h"
+
 #include "glibintl.h"
 
 static gint g_execute (const gchar  *file,
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 4f74f78fb..dab25047b 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #define _GNU_SOURCE		/* For stpcpy */
 
@@ -44,6 +42,7 @@
 #if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL)
 #include <signal.h>
 #endif
+
 #include "glib.h"
 #include "gprintfint.h"
 
diff --git a/glib/gstring.c b/glib/gstring.c
index c92c5a1c8..432149676 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -40,8 +38,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "glib.h"
 
+
 struct _GStringChunk
 {
   GHashTable *const_table;
diff --git a/glib/gthread.c b/glib/gthread.c
index e06fc2847..149781ebd 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -33,7 +33,6 @@
  */
 
 #include "config.h"
-#include "glib.h"
 
 #ifdef G_THREAD_USE_PID_SURROGATE
 #include <sys/types.h>
@@ -48,6 +47,9 @@
 
 #include <string.h>
 
+#include "glib.h"
+
+
 #if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P
 # define g_system_thread_equal_simple(thread1, thread2)			\
    ((thread1).dummy_pointer == (thread2).dummy_pointer)
diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index 25a9cd0ec..39cdd0f16 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -24,8 +24,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 typedef struct _GRealThreadPool GRealThreadPool;
 
 struct _GRealThreadPool
diff --git a/glib/gtimer.c b/glib/gtimer.c
index 30e249e18..250a1ef61 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -28,11 +28,8 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
-#include "glib.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -46,6 +43,9 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */
 
+#include "glib.h"
+
+
 struct _GTimer
 {
 #ifdef G_OS_WIN32
diff --git a/glib/gtree.c b/glib/gtree.c
index 2e4f99a73..0fd3f4d5e 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glib.h"
 
diff --git a/glib/gunibreak.c b/glib/gunibreak.c
index dddca457d..28757067c 100644
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -18,13 +18,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <stdlib.h>
 
 #include "glib.h"
 #include "gunibreak.h"
 
-#include <stdlib.h>
-
 
 #define TPROP(Page, Char) \
   ((break_property_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index c33a70dd7..efea3f730 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -18,6 +18,8 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <locale.h>
 #include <string.h>
 #ifdef __STDC_ISO_10646__
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index fd0648b6f..5c6fc3d7a 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -19,13 +19,14 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <stdlib.h>
 
 #include "glib.h"
 #include "gunidecomp.h"
 #include "gunicomp.h"
 
-#include <stdlib.h>
 
 #define CC(Page, Char) \
   ((combining_class_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
diff --git a/glib/guniprop.c b/glib/guniprop.c
index bb420c3e8..503df3c3e 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -19,15 +19,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
-
-#include "glib.h"
-#include "gunichartables.h"
+#include "config.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <locale.h>
 
+#include "glib.h"
+#include "gunichartables.h"
+
+
 #define ATTTABLE(Page, Char) \
   ((attr_table[Page] == G_UNICODE_MAX_TABLE_INDEX) ? 0 : (attr_data[attr_table[Page]][Char]))
 
diff --git a/glib/gutils.c b/glib/gutils.c
index 71761cb95..ad60e9ab2 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -28,9 +28,7 @@
  * MT safe for the unix part, FIXME: make the win32 part MT safe as well.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 796041781..9df2c6dfe 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -29,9 +29,7 @@
  * MT safe for the unix part, FIXME: make the win32 part MT safe as well.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include "glibconfig.h"