summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2009-05-01 10:08:52 -0400
committerDan Winship <danw@gnome.org>2009-05-01 10:37:45 -0400
commit92ac8d165eae438164cffce01fe92cdcf6488970 (patch)
treea3594fcf7797ee986f7f29e47d68080e19bfffef /tests
parent36cb01f447b2401195e3c6b577f490e868363630 (diff)
Misc warning fixes
glib/pcre/pcre_ucp_search_funcs.c, glib/pcre/pcre_valid_utf8.c: add back missing config.h includes, and this time add them to the copies in glib/update-pcre/ too so they don't get lost again on the next PCRE update. glib/garray.c, glib/gbase64.c: fix signed/unsigned pointer casts gio/xdgmime/xdgmimeglob.c: remove unused variable gio/tests/live-g-file.c: fix printf args on x86_64 tests/Makefile.am, tests/regex-test.c: remove redundant -DENABLE_REGEX
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am9
-rw-r--r--tests/regex-test.c2
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 57f1555f7..da1397643 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,18 +2,11 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS=gobject refcount
-if ENABLE_REGEX
-enable_regex = -DENABLE_REGEX
-else
-enable_regex =
-endif
-
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
- $(GLIB_DEBUG_FLAGS) \
- $(enable_regex)
+ $(GLIB_DEBUG_FLAGS)
AM_CFLAGS = -g
diff --git a/tests/regex-test.c b/tests/regex-test.c
index 2e0005131..6ad9ceb7d 100644
--- a/tests/regex-test.c
+++ b/tests/regex-test.c
@@ -20,6 +20,8 @@
#undef G_DISABLE_ASSERT
#undef G_LOG_DOMAIN
+#include "config.h"
+
#include <string.h>
#include <locale.h>
#include "glib.h"