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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 29a638f371b9d32d3f8c93a24564d4a865536c38..935ec8f8461f5c27800c33fa5975ede3207b37c3 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 260ef64b43704c189569403032cff4c14c56b828..02e3d31c49814ad982bc7baffc56811492b99614 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 d9e6489cdf3b362f95c9d2284f2621d1ef6ff5db..071dedb88f6aa6b5133a6366769d9e8ab4f1fb78 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 24e9a9ece5b8ea92735e2ce5a43fea6d60e4396d..e4b3fdba312033cdd7891c5ae07e7dffa3636ea4 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 a9891eca0a8d467a03f2a505ef3f6f94221769b1..3b50bdecdfccf01d58e9549ce7eae08b4cf41302 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 12e99a66b3c573044e169ae67cd097fba006125e..a462b027579ed6b0930b26093484fe7192fd635d 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 702cb3320ad1aa7646e94404909c858e55c6f4fc..2cfa40aca28e67d9a1c2805a604e81737aa4d23f 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 4de433a75e7107a217caf64bb2e8b9e6931708fe..03939f39d26efb3afba5e9551e89415b5ef21e31 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 7d8d9afd47ffd5d280a0185676a570f84cdcc3fa..fc0a92b42ff69c897a305f9366a119048fb4b007 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 bfbb714c2d07c2c1d7d11e9b497021529a203583..9153a0ac74747a9e17d2005b22d08f95d7f0da97 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 664aa2420d49015440360b67c4bf0e8ffcdfbe72..bd6a34b5d4fea67b79bf612e1c337fd8a964a71f 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 05120610e9294548049afb230c044518f3dccaf7..a2653f3331f97db53a44f876d7a5f634aac59ca9 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 d2b0fcdb4a272a35e5eab0cbe581d08dc616a12e..b1545a0e258829385589b649d8c28d6e27888634 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 3091375d806f33292be25f64003505552cf4a890..68ed280ef7810614b3fd9f89941f8677e9696687 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 d347de5b21cb2a31e0b2faa4b049029ab765ce38..29d29fb23b77c3119238f82c894c347ed45d9e8e 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 3935cb1b1169caecedbfc09d797e87b22e1dbdc5..9838519096ac3dc9c356211868f4585dd47f1006 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 4b2e78384760a1fa54c26b9d5d02f28e9cbcded8..a45952e7aae5f14c7c7272dc5fe71d6027598e7e 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 5d3a13a5ca9dd11d4f9936480e8b3e3d97b6bffe..22445a86438835c6f4f559d64cc8339bf1c81051 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 0fb2358a7b6844b4205171a89c95658233fc96fa..820c3eeb80f33d6a3e9ad3c2e3a59fa752470c3c 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 a6888fe1cdd0579f25a2439547284c3bbfa90df2..c31a1804e03fe18b8fccaaf1642fdb06d49890e9 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 924998080a5efd2b6c64612e9dec0826f2185c58..302c6f75748a4d06f9e671ad8c593b3eaea8d900 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 0d63bb76c75de5a80b09f0a98138ebe44969d0ae..439c1c89ed31b09e6a6d2b1910ce56e6fa5b42ac 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 5dcb4bf079d968b64c7177c436eabd2e37c3959c..8c9314c791bb46f8863db092b835085b27c2e61c 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 9db4d5c8bd3cb3b15d09ac53e9ed80c494ddb157..debbfa05aa80570fe712c0299299a07e53e792a5 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 36d53ff4a154951f3518388a454f4e716743c0a1..f328878d50e7269a13d11cbd75e4043ddc08b207 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 92cd822622887da6d424dd5a93f23c76d4a88b33..d45deb6417b95bc85c320b5c41fa4ee40325a40c 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 d1fb24547a55986fb3f00f871e25705ccc915c64..790241a704f2546eaa54cb7b28b3b52e89840414 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 08318fd914774a8149520948e7dc7c8706fe1468..b6e5b522781558391f60b22548ba252759475f2b 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 18e08e42dc6ca0f502ae7bd0468e330d382c2f27..4cac78fbc0362b335e3fd5275f5b6d90e6464f36 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 a289f059fa3bed82be13ebde20910e6c4df012c7..18a398e92ec67f5e3510300f6a0e456288de1b60 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 3950063db179444b7d74b9adb60ad51df7c42b0c..ab6eb2da7f1e538759b78f8a2a324ba9de434a64 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 b360871db9cea49f15fee1f5a9d6b079002df527..165d9958617fb0f0811f236c76751bdf6b60d9d1 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 4f74f78fbce6fe10fa5a4c3cbc37b60463e34082..dab25047b3ad0dbb82f10f21087e98604c031371 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 c92c5a1c8b90249291fcc9dd7ceaf32cb2d30280..432149676661ec596044f5dba63dde61a235f030 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 e06fc28470d1e55a7c1824198bf0be47448a6ce0..149781ebdc4304f46b16fb8ef8b683a629e6d9b4 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 25a9cd0ec2e0bc886a49aa0849c05852fabb8f8f..39cdd0f16775753ffd0dbcc14dbf4d8a67b246a9 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 30e249e18d7ac4ea0d7cfd0970a7ae7cb05398b1..250a1ef619be902335b4672ee7de3cb1b15c8053 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 2e4f99a736213e20ee3f64a975969847c19e81f8..0fd3f4d5ef7e07eef313ce78e27512db156e613f 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 dddca457d9e100de38bcaf3aa78c84b776159274..28757067c78243d8324dc8713315efb0235786ed 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 c33a70dd7ea5b03254ca564f2da5984f8be30e4a..efea3f730144d3f9835d66fe5d59d46b29c2b47d 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 fd0648b6f7e912eaf84d16c1782ef34fafbfc0a2..5c6fc3d7aa49a386ad54dc824c6208ed7d1bb1bb 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 bb420c3e8fba3844b62420e17ddb464446f0221b..503df3c3ecec8f6246e19cf1c25856bb4d3c2159 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 71761cb959f6469987e4964d4a8281bf74c1ed95..ad60e9ab2d6defbf0822e1830b1e968cdf3e739b 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 796041781528ae0b824dfb15521cae60c0c21b5c..9df2c6dfe64fb05537bf542fead13b16855a2d7a 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"