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)

diff --git a/ChangeLog b/ChangeLog
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 29a638f..935ec8f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+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)
+
 2002-12-03  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Check that strlcpy behaves as per the OpenBSD 

diff --git a/glib/garray.c b/glib/garray.c
index 260ef64..02e3d31 100644 (file)
--- 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 d9e6489..071dedb 100644 (file)
--- 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 24e9a9e..e4b3fdb 100644 (file)
--- 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 a9891ec..3b50bde 100644 (file)
--- 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 12e99a6..a462b02 100644 (file)
--- 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 702cb33..2cfa40a 100644 (file)
--- 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 4de433a..03939f3 100644 (file)
--- 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 7d8d9af..fc0a92b 100644 (file)
--- 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 bfbb714..9153a0a 100644 (file)
--- 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 664aa24..bd6a34b 100644 (file)
--- 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 0512061..a2653f3 100644 (file)
--- 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 d2b0fcd..b1545a0 100644 (file)
--- 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 3091375..68ed280 100644 (file)
--- 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 d347de5..29d29fb 100644 (file)
--- 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 3935cb1..9838519 100644 (file)
--- 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 4b2e783..a45952e 100644 (file)
--- 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 5d3a13a..22445a8 100644 (file)
--- 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 0fb2358..820c3ee 100644 (file)
--- 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 a6888fe..c31a180 100644 (file)
--- 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 9249980..302c6f7 100644 (file)
--- 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 0d63bb7..439c1c8 100644 (file)
--- 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 5dcb4bf..8c9314c 100644 (file)
--- 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 9db4d5c..debbfa0 100644 (file)
--- 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 36d53ff..f328878 100644 (file)
--- 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 92cd822..d45deb6 100644 (file)
--- 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 d1fb245..790241a 100644 (file)
--- 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 08318fd..b6e5b52 100644 (file)
--- 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 18e08e4..4cac78f 100644 (file)
--- 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 a289f05..18a398e 100644 (file)
--- 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 3950063..ab6eb2d 100644 (file)
--- 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 b360871..165d995 100644 (file)
--- 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 4f74f78..dab2504 100644 (file)
--- 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 c92c5a1..4321496 100644 (file)
--- 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 e06fc28..149781e 100644 (file)
--- 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 25a9cd0..39cdd0f 100644 (file)
--- 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 30e249e..250a1ef 100644 (file)
--- 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 2e4f99a..0fd3f4d 100644 (file)
--- 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 dddca45..2875706 100644 (file)
--- 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 c33a70d..efea3f7 100644 (file)
--- 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 fd0648b..5c6fc3d 100644 (file)
--- 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 bb420c3..503df3c 100644 (file)
--- 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 71761cb..ad60e9a 100644 (file)
--- 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 7960417..9df2c6d 100644 (file)
--- 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"