diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-03-15 15:17:17 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-03-15 15:17:17 +0000 |
| commit | b91d083561cc637c3123a3c2e08035e2878c70cc (patch) | |
| tree | 49d4634645e3c6c53800fe1cbfac681f6133a183 /glib/pcre | |
| parent | 851c7067aaaf6e22dc946603bab9285b3630af13 (diff) | |
| download | glib-b91d083561cc637c3123a3c2e08035e2878c70cc.tar.gz | |
Add -I$(top_srcdir)/glib so that gregex.h finds <glib.h>.
2007-03-15 Tor Lillqvist <tml@novell.com>
* glib/gnulib/Makefile.am (INCLUDES): Add -I$(top_srcdir)/glib so
that gregex.h finds <glib.h>.
* glib/update-pcre/Makefille.am-1: Add -DGLIB_COMPILATION so that
we don't think g_ascii_table is dllimport.
* glib/pcre/Makefile.am: Corresponding change.
* glib/update-pcre/notdll.patch: New file. Drop
dllimport/dllexport magic for the pcre symbols.
* glib/update-pcre/Makefile.am: Dist it.
* glib/update-pcre/update.sh: Apply notdll.patch.
* glib/pcre/pcre.h: Corresponding change.
2007-03-15 Tor Lillqvist <tml@novell.com>
* glib/gtypes.h: Add comment to avoid misleading people with the
large number of digits in G_PI etc. (#404338)
svn path=/trunk/; revision=5410
Diffstat (limited to 'glib/pcre')
| -rw-r--r-- | glib/pcre/Makefile.am | 1 | ||||
| -rw-r--r-- | glib/pcre/pcre.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am index 61f8aa294..928eb0f97 100644 --- a/glib/pcre/Makefile.am +++ b/glib/pcre/Makefile.am @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir)/glib \ @GLIB_DEBUG_FLAGS@ \ -DG_DISABLE_DEPRECATED \ + -DGLIB_COMPILATION \ $(DEPRECATED_FLAGS)\ $(WARN_CFLAGS) \ $(PCRE_WARN_CFLAGS) \ diff --git a/glib/pcre/pcre.h b/glib/pcre/pcre.h index 1b29a18f3..f32856446 100644 --- a/glib/pcre/pcre.h +++ b/glib/pcre/pcre.h @@ -60,6 +60,8 @@ circumstance. */ /* Win32 uses DLL by default; it needs special stuff for exported functions when building PCRE. */ +/* But don't do that when building as part of GLib */ +#if 0 #ifdef _WIN32 # ifdef PCRE_DEFINITION # ifdef DLL_EXPORT @@ -71,6 +73,7 @@ when building PCRE. */ # endif # endif #endif +#endif /* Otherwise, we use the standard "extern". */ |