glib r6877 - trunk/gmodule

[mitch svn gnome org]

Author: mitch
Date: Mon May  5 15:04:58 2008
New Revision: 6877
URL: http://svn.gnome.org/viewvc/glib?rev=6877&view=rev

Log:
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"



Modified:
   trunk/gmodule/ChangeLog
   trunk/gmodule/Makefile.am
   trunk/gmodule/gmodule.c

Modified: trunk/gmodule/Makefile.am
==============================================================================
--- trunk/gmodule/Makefile.am	(original)
+++ trunk/gmodule/Makefile.am	Mon May  5 15:04:58 2008
@@ -7,7 +7,8 @@
 	-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 	\

Modified: trunk/gmodule/gmodule.c
==============================================================================
--- trunk/gmodule/gmodule.c	(original)
+++ trunk/gmodule/gmodule.c	Mon May  5 15:04:58 2008
@@ -29,7 +29,8 @@
  */
 
 #include "config.h"
-#include "glibconfig.h"
+
+#include "glib.h"
 
 #include <errno.h>
 #include <string.h>