diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-11-07 09:49:25 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-11-07 09:49:25 +0000 |
| commit | 7d2ec70a49558247fb5874b1770e315e8deff235 (patch) | |
| tree | d771e846ad692479f4fe662b75321c7ca8ccc1a8 /tests | |
| parent | 15cc4be96ca5c81a9bd2665ce2a75e8e8501e4c8 (diff) | |
Not needed, just use -DPCRE_STATIC.
2007-11-07 Tor Lillqvist <tml@novell.com>
* glib/update-pcre/notdll.patch: Not needed, just use -DPCRE_STATIC.
* glib/update-pcre/Makefile.am: Drop notdll.patch.
* glib/update-pcre/Makefile.am-1
* glib/update-pcre/update.sh
* glib/pcre/Makefile.am
* glib/Makefile.am: Use -DPCRE_STATIC.
* tests/gio-test.c
* tests/mainloop-test.c
* tests/spawn-test.c: #define pipe(fds) _pipe(fds, 4096,
_O_BINARY) on Windows.
* tests/regex-test.c (test_expand): Don't print NULL with %s.
svn path=/trunk/; revision=5805
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gio-test.c | 1 | ||||
| -rw-r--r-- | tests/mainloop-test.c | 1 | ||||
| -rw-r--r-- | tests/regex-test.c | 4 | ||||
| -rw-r--r-- | tests/spawn-test.c | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/tests/gio-test.c b/tests/gio-test.c index 1ed523607..cc56ef422 100644 --- a/tests/gio-test.c +++ b/tests/gio-test.c @@ -39,6 +39,7 @@ #include <process.h> #define STRICT #include <windows.h> + #define pipe(fds) _pipe(fds, 4096, _O_BINARY) #else #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/tests/mainloop-test.c b/tests/mainloop-test.c index 2c8be1034..cfa7f7391 100644 --- a/tests/mainloop-test.c +++ b/tests/mainloop-test.c @@ -12,6 +12,7 @@ #ifdef G_OS_WIN32 #include <fcntl.h> /* For _O_BINARY used by pipe() macro */ #include <io.h> /* for _pipe() */ +#define pipe(fds) _pipe(fds, 4096, _O_BINARY) #endif #define ITERS 10000 diff --git a/tests/regex-test.c b/tests/regex-test.c index 26d96776f..94c57671a 100644 --- a/tests/regex-test.c +++ b/tests/regex-test.c @@ -1098,7 +1098,9 @@ test_expand (const gchar *pattern, gchar *res; verbose ("expanding the references in \"%s\" (pattern: \"%s\", string: \"%s\") \t", - string_to_expand, pattern, string); + string_to_expand, + pattern ? pattern : "(null)", + string ? string : "(null)"); if (pattern) { diff --git a/tests/spawn-test.c b/tests/spawn-test.c index 501049be5..1bc360a42 100644 --- a/tests/spawn-test.c +++ b/tests/spawn-test.c @@ -35,6 +35,7 @@ #ifdef G_OS_WIN32 #include <fcntl.h> #include <io.h> +#define pipe(fds) _pipe(fds, 4096, _O_BINARY) #endif |