From 307391459ddd322bccee190d8ded32fb462e8c50 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Tue, 9 May 2006 23:07:27 +0000 Subject: [PATCH] Use canonical include form for internal headers. config.h is always there. 2006-05-09 Sebastian Wilhelmi * glib/gprintf.c, glib/gspawn-win32.c, glib/gutf8.c, gthread/gthread-impl.c, gthread/gthread-posix.c, gthread/gthread-win32.c: Use canonical include form for internal headers. config.h is always there. --- ChangeLog | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ glib/gprintf.c | 4 +--- glib/gspawn-win32.c | 2 +- glib/gutf8.c | 2 +- gthread/gthread-impl.c | 8 +++----- gthread/gthread-posix.c | 2 +- gthread/gthread-win32.c | 6 ++---- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d24cf3bf..37279d034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-05-09 Sebastian Wilhelmi + * glib/gprintf.c, glib/gspawn-win32.c, glib/gutf8.c, + gthread/gthread-impl.c, gthread/gthread-posix.c, + gthread/gthread-win32.c: Use canonical include form for internal + headers. config.h is always there. + * Remove obsolete gthread/gthread-solaris.c. 2006-05-08 Matthias Clasen diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7d24cf3bf..37279d034 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,10 @@ 2006-05-09 Sebastian Wilhelmi + * glib/gprintf.c, glib/gspawn-win32.c, glib/gutf8.c, + gthread/gthread-impl.c, gthread/gthread-posix.c, + gthread/gthread-win32.c: Use canonical include form for internal + headers. config.h is always there. + * Remove obsolete gthread/gthread-solaris.c. 2006-05-08 Matthias Clasen diff --git a/glib/gprintf.c b/glib/gprintf.c index 2c3f29c18..e62e34c3f 100644 --- a/glib/gprintf.c +++ b/glib/gprintf.c @@ -17,9 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #define _GNU_SOURCE /* For vasprintf */ diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 752cb820c..d7be7b7a5 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -42,7 +42,7 @@ /* Define this to get some logging all the time */ /* #define G_SPAWN_WIN32_DEBUG */ -#include +#include "config.h" #include "glib.h" #include "gprintfint.h" diff --git a/glib/gutf8.c b/glib/gutf8.c index f779b9291..e9c70c7b2 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" #include #ifdef HAVE_CODESET diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c index 901c3b430..7c20b65f1 100644 --- a/gthread/gthread-impl.c +++ b/gthread/gthread-impl.c @@ -31,12 +31,10 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" -#include -#include +#include "glib.h" +#include "gthreadinit.h" #ifdef G_THREADS_ENABLED diff --git a/gthread/gthread-posix.c b/gthread/gthread-posix.c index 0ead204a9..7efc2b4fd 100644 --- a/gthread/gthread-posix.c +++ b/gthread/gthread-posix.c @@ -31,7 +31,7 @@ * MT safe */ -#include +#include "config.h" #include #include diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c index 72a0724b5..dda269366 100644 --- a/gthread/gthread-win32.c +++ b/gthread/gthread-win32.c @@ -32,11 +32,9 @@ * MT safe */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" -#include +#include "glib.h" #define STRICT #define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */