diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | glib/tests/option-context.c | 3 | ||||
| -rw-r--r-- | glib/tests/testing.c | 4 | ||||
| -rw-r--r-- | tests/testingbase64.c | 3 |
5 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,12 @@ +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> + 2008-05-27 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version diff --git a/configure.in b/configure.in index c8207c875..b21ec45e5 100644 --- a/configure.in +++ b/configure.in @@ -487,6 +487,8 @@ if test "x$GCC" = "xyes"; then 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.]) diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c index 29b9991ed..c3caad655 100644 --- a/glib/tests/option-context.c +++ b/glib/tests/option-context.c @@ -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> diff --git a/glib/tests/testing.c b/glib/tests/testing.c index b73f2cfe3..561d5e639 100644 --- a/glib/tests/testing.c +++ b/glib/tests/testing.c @@ -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 */ diff --git a/tests/testingbase64.c b/tests/testingbase64.c index ccf233274..3e64d1a0b 100644 --- a/tests/testingbase64.c +++ b/tests/testingbase64.c @@ -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> |