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)

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 

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 

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 

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 

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 

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 

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 

glib/garray.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include <string.h>
 #include <stdlib.h>

glib/gasyncqueue.c

@@ -24,8 +24,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 struct _GAsyncQueue
 {
   GMutex *mutex;

glib/gbacktrace.c

@@ -29,9 +29,7 @@
  * then
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include <signal.h>
 #include <stdarg.h>

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__

glib/gcache.c

@@ -28,6 +28,8 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
 

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);
 

glib/gconvert.c

@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <iconv.h>
 #include <errno.h>

glib/gdataset.c

@@ -31,9 +31,11 @@
  * looked at yet.  
  */
 
-#include        <string.h>
+#include "config.h"
-#include	"glib.h"
 
+#include <string.h>
+
+#include "glib.h"
 
 
 /* --- defines --- */

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>

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,

glib/ghash.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

glib/ghook.c

@@ -31,7 +31,9 @@
  * MT safe
  */
 
-#include	"glib.h"
+#include "config.h"
+
+#include "glib.h"
 
 
 /* --- defines --- */

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

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
  */

glib/glist.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

glib/gmarkup.c

@@ -18,15 +18,15 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
-
-#include "glib.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
+#include "glib.h"
+
 #include "glibintl.h"
 
 GQuark

glib/gmem.c

@@ -28,13 +28,12 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+
 #include "glib.h"
 
 

glib/gmessages.c

@@ -28,21 +28,20 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #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"
 

glib/gnode.c

@@ -31,9 +31,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

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

glib/gprimes.c

@@ -28,8 +28,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 static const guint g_primes[] =
 {
   11,

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									      \

glib/gqueue.c

@@ -24,9 +24,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

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;
 

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

glib/gscanner.c

@@ -31,24 +31,23 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
+#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) (							\

glib/gshell.c

@@ -20,10 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <string.h>
 
 #include "glib.h"
-#include <string.h>
 
 #ifdef _
 #warning "FIXME remove gettext hack"

glib/gslist.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

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

glib/gspawn-win32.c

@@ -39,6 +39,8 @@
 
 #include <config.h>
 
+#include "config.h"
+
 #include "glib.h"
 #include "gprintfint.h"
 

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,

glib/gstrfuncs.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #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"
 

glib/gstring.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #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;

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)

glib/gthreadpool.c

@@ -24,8 +24,11 @@
  * MT safe
  */
 
+#include "config.h"
+
 #include "glib.h"
 
+
 typedef struct _GRealThreadPool GRealThreadPool;
 
 struct _GRealThreadPool

glib/gtimer.c

@@ -28,11 +28,8 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
-#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

glib/gtree.c

@@ -28,9 +28,7 @@
  * MT safe
  */
 
-#ifdef HAVE_CONFIG_H
+#include "config.h"
-#include <config.h>
-#endif
 
 #include "glib.h"
 

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) \

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__

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) \

glib/guniprop.c

@@ -19,15 +19,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
-
-#include "glib.h"
-#include "gunichartables.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]))
 

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"
-#include <config.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

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"
-#include <config.h>
-#endif
 
 #include "glibconfig.h"