glib r6955 - in trunk: . glib/tests tests

[mitch svn gnome org]

Author: mitch
Date: Wed May 28 16:18:27 2008
New Revision: 6955
URL: http://svn.gnome.org/viewvc/glib?rev=6955&view=rev

Log:
2008-05-28  Michael Natterer  <mitch imendio com>

	* configure.in: add G_DISABLE_SINGLE_INCLUDES to CPPFLAGS
	globally.

	* glib/tests/option-context.c
	* glib/tests/testing.c
	* tests/testingbase64.c: don't include <glib/gtestutils.h>



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glib/tests/option-context.c
   trunk/glib/tests/testing.c
   trunk/tests/testingbase64.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed May 28 16:18:27 2008
@@ -487,6 +487,8 @@
   esac
 fi
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+
 if test "$glib_native_win32" = "yes"; then
   if test x$enable_static = xyes -a x$enable_shared = xyes; then
     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])

Modified: trunk/glib/tests/option-context.c
==============================================================================
--- trunk/glib/tests/option-context.c	(original)
+++ trunk/glib/tests/option-context.c	Wed May 28 16:18:27 2008
@@ -19,7 +19,8 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
 
 #include <stdlib.h>
 

Modified: trunk/glib/tests/testing.c
==============================================================================
--- trunk/glib/tests/testing.c	(original)
+++ trunk/glib/tests/testing.c	Wed May 28 16:18:27 2008
@@ -19,7 +19,9 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
+
 #include <stdlib.h>
 
 /* test assertion variants */

Modified: trunk/tests/testingbase64.c
==============================================================================
--- trunk/tests/testingbase64.c	(original)
+++ trunk/tests/testingbase64.c	Wed May 28 16:18:27 2008
@@ -18,7 +18,8 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>