mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-12 07:26:15 +01:00
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
This commit is contained in:
parent
15cc4be96c
commit
7d2ec70a49
18
ChangeLog
18
ChangeLog
@ -1,3 +1,21 @@
|
||||
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.
|
||||
|
||||
2007-11-07 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* configure.in: Bump version
|
||||
|
@ -23,7 +23,8 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre
|
||||
DIST_SUBDIRS = libcharset gnulib pcre update-pcre
|
||||
|
||||
INCLUDES = -I$(top_srcdir) $(pcre_inc) -DG_LOG_DOMAIN=\"GLib\" \
|
||||
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
|
||||
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION \
|
||||
-DPCRE_STATIC
|
||||
|
||||
glib.def: glib.symbols
|
||||
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
|
||||
|
@ -10,6 +10,7 @@ INCLUDES = \
|
||||
-DMAX_DUPLENGTH=30000 \
|
||||
-DLINK_SIZE=2 \
|
||||
-DPOSIX_MALLOC_THRESHOLD=10 \
|
||||
-DPCRE_STATIC \
|
||||
-I$(top_srcdir) \
|
||||
-I$(srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
|
@ -4,6 +4,5 @@ EXTRA_DIST = \
|
||||
Makefile.am-2 \
|
||||
digitab.patch \
|
||||
memory.patch \
|
||||
notdll.patch \
|
||||
pcre_ucp_searchfuncs.c \
|
||||
pcre_valid_utf8.c
|
||||
|
@ -11,6 +11,7 @@ INCLUDES = \
|
||||
-DLINK_SIZE=2 \
|
||||
-DEBCDIC=0 \
|
||||
-DPOSIX_MALLOC_THRESHOLD=10 \
|
||||
-DPCRE_STATIC \
|
||||
-I$(top_srcdir) \
|
||||
-I$(srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
|
@ -1,19 +0,0 @@
|
||||
--- pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200
|
||||
+++ pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200
|
||||
@@ -51,13 +51,16 @@
|
||||
export setting is defined in pcre_internal.h, which includes this file. So we
|
||||
don't change an existing definition of PCRE_EXP_DECL. */
|
||||
|
||||
+/* But don't do that when building as part of GLib */
|
||||
+#if 0
|
||||
#ifndef PCRE_EXP_DECL
|
||||
# ifdef _WIN32
|
||||
# ifndef PCRE_STATIC
|
||||
# define PCRE_EXP_DECL extern __declspec(dllimport)
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
/* By default, we use the standard "extern" declarations. */
|
||||
|
@ -128,9 +128,6 @@ cp $PCRE/COPYING .
|
||||
# Use glib for memory allocation.
|
||||
patch > /dev/null < $IN/memory.patch
|
||||
|
||||
# No dllimport/dllexport of pcre symbols
|
||||
patch > /dev/null <$IN/notdll.patch
|
||||
|
||||
# Copy the modified version of pcre_valid_utf8.c.
|
||||
cp $IN/pcre_valid_utf8.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>
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -35,6 +35,7 @@
|
||||
#ifdef G_OS_WIN32
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user