From bbbd329ff5bd634b4e1d4fb43b13538779e44a78 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 4 Dec 2002 01:27:44 +0000 Subject: [PATCH] Patch from Sven Neumann to make the include order consistent. (#71704) Tue Dec 3 20:22:27 2002 Owen Taylor * glib/*.c: Patch from Sven Neumann to make the include order consistent. (#71704) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/garray.c | 4 +--- glib/gasyncqueue.c | 3 +++ glib/gbacktrace.c | 4 +--- glib/gbsearcharray.c | 2 +- glib/gcache.c | 2 ++ glib/gcompletion.c | 6 +++++- glib/gconvert.c | 2 +- glib/gdataset.c | 6 ++++-- glib/gdate.c | 6 ++---- glib/gerror.c | 3 +++ glib/ghash.c | 4 +--- glib/ghook.c | 4 +++- glib/giochannel.c | 3 ++- glib/giounix.c | 3 ++- glib/glist.c | 4 +--- glib/gmarkup.c | 6 +++--- glib/gmem.c | 5 ++--- glib/gmessages.c | 7 +++---- glib/gnode.c | 4 +--- glib/gpattern.c | 6 +++++- glib/gprimes.c | 3 +++ glib/gqsort.c | 3 +++ glib/gqueue.c | 4 +--- glib/grand.c | 6 +++++- glib/grel.c | 6 +++++- glib/gscanner.c | 11 +++++------ glib/gshell.c | 5 +++-- glib/gslist.c | 4 +--- glib/gspawn-win32-helper.c | 3 +++ glib/gspawn-win32.c | 2 ++ glib/gspawn.c | 5 +++-- glib/gstrfuncs.c | 5 ++--- glib/gstring.c | 6 +++--- glib/gthread.c | 4 +++- glib/gthreadpool.c | 3 +++ glib/gtimer.c | 8 ++++---- glib/gtree.c | 4 +--- glib/gunibreak.c | 6 +++--- glib/gunicollate.c | 2 ++ glib/gunidecomp.c | 5 +++-- glib/guniprop.c | 9 +++++---- glib/gutils.c | 4 +--- glib/gwin32.c | 4 +--- 50 files changed, 146 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29a638f3..935ec8f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 29a638f3..935ec8f8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Dec 3 20:22:27 2002 Owen Taylor + + * glib/*.c: Patch from Sven Neumann to make the + include order consistent. (#71704) + 2002-12-03 Matthias Clasen * configure.in: Check that strlcpy behaves as per the OpenBSD diff --git a/glib/garray.c b/glib/garray.c index 260ef64b..02e3d31c 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c index d9e6489c..071dedb8 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 24e9a9ec..e4b3fdba 100644 --- a/glib/gbacktrace.c +++ b/glib/gbacktrace.c @@ -29,9 +29,7 @@ * then */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/glib/gbsearcharray.c b/glib/gbsearcharray.c index a9891eca..3b50bdec 100644 --- a/glib/gbsearcharray.c +++ b/glib/gbsearcharray.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" #define G_IMPLEMENT_INLINES 1 #define __G_BSEARCHARRAY_C__ diff --git a/glib/gcache.c b/glib/gcache.c index 12e99a66..a462b027 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 702cb332..2cfa40ac 100644 --- a/glib/gcompletion.c +++ b/glib/gcompletion.c @@ -28,9 +28,13 @@ * MT safe */ -#include "glib.h" +#include "config.h" + #include +#include "glib.h" + + static void completion_check_cache (GCompletion* cmp, gchar** new_prefix); diff --git a/glib/gconvert.c b/glib/gconvert.c index 4de433a7..03939f39 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" #include #include diff --git a/glib/gdataset.c b/glib/gdataset.c index 7d8d9afd..fc0a92b4 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -31,9 +31,11 @@ * looked at yet. */ -#include -#include "glib.h" +#include "config.h" +#include + +#include "glib.h" /* --- defines --- */ diff --git a/glib/gdate.c b/glib/gdate.c index bfbb714c..9153a0ac 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 -#endif - #include "glib.h" #include diff --git a/glib/gerror.c b/glib/gerror.c index 664aa242..bd6a34b5 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 05120610..a2653f33 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/ghook.c b/glib/ghook.c index d2b0fcdb..b1545a0e 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 3091375d..68ed280e 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -32,7 +32,6 @@ */ #include "config.h" -#include "giochannel.h" #include #include @@ -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 d347de5b..29d29fb2 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -33,7 +33,6 @@ #include "config.h" -#include "glib.h" #include #include #include @@ -42,6 +41,8 @@ #include #include +#include "glib.h" + /* * Unix IO Channels */ diff --git a/glib/glist.c b/glib/glist.c index 3935cb1b..98385190 100644 --- a/glib/glist.c +++ b/glib/glist.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 4b2e7838..a45952e7 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -18,15 +18,15 @@ * Boston, MA 02111-1307, USA. */ -#include - -#include "glib.h" +#include "config.h" #include #include #include #include +#include "glib.h" + #include "glibintl.h" GQuark diff --git a/glib/gmem.c b/glib/gmem.c index 5d3a13a5..22445a86 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -28,13 +28,12 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include #include + #include "glib.h" diff --git a/glib/gmessages.c b/glib/gmessages.c index 0fb2358a..820c3eeb 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -28,21 +28,20 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include #include #include -#include "glib.h" #ifdef HAVE_UNISTD_H #include #endif #include #include #include + +#include "glib.h" #include "gdebug.h" #include "gprintfint.h" diff --git a/glib/gnode.c b/glib/gnode.c index a6888fe1..c31a1804 100644 --- a/glib/gnode.c +++ b/glib/gnode.c @@ -31,9 +31,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/gpattern.c b/glib/gpattern.c index 92499808..302c6f75 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 + #include "gpattern.h" #include "gmacros.h" @@ -23,7 +28,6 @@ #include "gmem.h" #include "gunicode.h" #include "gutils.h" -#include /* 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 0d63bb76..439c1c89 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 5dcb4bf0..8c9314c7 100644 --- a/glib/gqsort.c +++ b/glib/gqsort.c @@ -32,10 +32,13 @@ * at ftp://ftp.gtk.org/pub/gtk/. */ +#include "config.h" + #include #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 9db4d5c8..debbfa05 100644 --- a/glib/gqueue.c +++ b/glib/gqueue.c @@ -24,9 +24,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/grand.c b/glib/grand.c index 36d53ff4..f328878d 100644 --- a/glib/grand.c +++ b/glib/grand.c @@ -36,10 +36,14 @@ * MT safe */ -#include +#include "config.h" + #include #include +#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 92cd8226..d45deb64 100644 --- a/glib/grel.c +++ b/glib/grel.c @@ -27,10 +27,14 @@ * MT safe */ -#include "glib.h" +#include "config.h" + #include #include +#include "glib.h" + + typedef struct _GRealTuples GRealTuples; struct _GRelation diff --git a/glib/gscanner.c b/glib/gscanner.c index d1fb2454..790241a7 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -31,24 +31,23 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" +#include #include #include #include #include -#include "glib.h" -#include "gprintfint.h" #ifdef HAVE_UNISTD_H #include #endif -#include #ifdef G_OS_WIN32 #include /* 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 08318fd9..b6e5b522 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -20,11 +20,12 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" -#include "glib.h" #include +#include "glib.h" + #ifdef _ #warning "FIXME remove gettext hack" #endif diff --git a/glib/gslist.c b/glib/gslist.c index 18e08e42..4cac78fb 100644 --- a/glib/gslist.c +++ b/glib/gslist.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c index a289f059..18a398e9 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 3950063d..ab6eb2da 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -39,6 +39,8 @@ #include +#include "config.h" + #include "glib.h" #include "gprintfint.h" diff --git a/glib/gspawn.c b/glib/gspawn.c index b360871d..165d9958 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -20,9 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" -#include "glib.h" #include #include #include @@ -36,6 +35,8 @@ #include #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 4f74f78f..dab25047 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #define _GNU_SOURCE /* For stpcpy */ @@ -44,6 +42,7 @@ #if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL) #include #endif + #include "glib.h" #include "gprintfint.h" diff --git a/glib/gstring.c b/glib/gstring.c index c92c5a1c..43214967 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include @@ -40,8 +38,10 @@ #include #include #include + #include "glib.h" + struct _GStringChunk { GHashTable *const_table; diff --git a/glib/gthread.c b/glib/gthread.c index e06fc284..149781eb 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 @@ -48,6 +47,9 @@ #include +#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 25a9cd0e..39cdd0f1 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 30e249e1..250a1ef6 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -28,11 +28,8 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" -#include "glib.h" #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @@ -46,6 +43,9 @@ #include #endif /* G_OS_WIN32 */ +#include "glib.h" + + struct _GTimer { #ifdef G_OS_WIN32 diff --git a/glib/gtree.c b/glib/gtree.c index 2e4f99a7..0fd3f4d5 100644 --- a/glib/gtree.c +++ b/glib/gtree.c @@ -28,9 +28,7 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "glib.h" diff --git a/glib/gunibreak.c b/glib/gunibreak.c index dddca457..28757067 100644 --- a/glib/gunibreak.c +++ b/glib/gunibreak.c @@ -18,13 +18,13 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" + +#include #include "glib.h" #include "gunibreak.h" -#include - #define TPROP(Page, Char) \ ((break_property_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \ diff --git a/glib/gunicollate.c b/glib/gunicollate.c index c33a70dd..efea3f73 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -18,6 +18,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include #ifdef __STDC_ISO_10646__ diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index fd0648b6..5c6fc3d7 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -19,13 +19,14 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" + +#include #include "glib.h" #include "gunidecomp.h" #include "gunicomp.h" -#include #define CC(Page, Char) \ ((combining_class_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \ diff --git a/glib/guniprop.c b/glib/guniprop.c index bb420c3e..503df3c3 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -19,15 +19,16 @@ * Boston, MA 02111-1307, USA. */ -#include - -#include "glib.h" -#include "gunichartables.h" +#include "config.h" #include #include #include +#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 71761cb9..ad60e9ab 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 -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include diff --git a/glib/gwin32.c b/glib/gwin32.c index 79604178..9df2c6df 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 -#endif +#include "config.h" #include "glibconfig.h" -- 2.34.1