From: Michael Natterer <mitch@imendio.com>
Date: Mon, 5 May 2008 15:04:58 +0000 (+0000)
Subject: Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent code from
X-Git-Tag: GLIB_2_17_0~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70af00fc0662a49b3de10b1784648387bbd6abd3;p=platform%2Fupstream%2Fglib.git

Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent code from

2008-05-05  Michael Natterer  <mitch@imendio.com>

	* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
	code from being checked in that breaks the build of applications
	which use G_DISABLE_SINGLE_INCLUDES.

	* gmodule.c: #include "glib.h" instead of "glibconfig.h"


svn path=/trunk/; revision=6877
---

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 6ff9b40..437a35e 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-05  Michael Natterer  <mitch@imendio.com>
+
+	* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
+	code from being checked in that breaks the build of applications
+	which use G_DISABLE_SINGLE_INCLUDES.
+
+	* gmodule.c: #include "glib.h" instead of "glibconfig.h"
+
 2008-03-16  Tor Lillqvist  <tml@novell.com>
 
 	* Makefile.am: Define gmodule_def locally here instead of using an
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 852aabb..3965fc8 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = 				\
 	-I$(top_srcdir)/gmodule 	\
 	-DG_LOG_DOMAIN=\"GModule\" 	\
 	@GLIB_DEBUG_FLAGS@ 		\
-	-DG_DISABLE_DEPRECATED
+	-DG_DISABLE_DEPRECATED		\
+	-DG_DISABLE_SINGLE_INCLUDES
 
 EXTRA_DIST +=				\
 		makefile.msc.in 	\
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 40e9e2e..23e6828 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -29,7 +29,8 @@
  */
 
 #include "config.h"
-#include "glibconfig.h"
+
+#include "glib.h"
 
 #include <errno.h>
 #include <string.h>