From b91d083561cc637c3123a3c2e08035e2878c70cc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 15 Mar 2007 15:17:17 +0000 Subject: [PATCH] Add -I$(top_srcdir)/glib so that gregex.h finds . 2007-03-15 Tor Lillqvist * glib/gnulib/Makefile.am (INCLUDES): Add -I$(top_srcdir)/glib so that gregex.h finds . * 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 * 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 --- ChangeLog | 24 ++++++++++++++++++++++++ glib/gnulib/Makefile.am | 2 +- glib/gtypes.h | 7 +++++++ glib/pcre/Makefile.am | 1 + glib/pcre/pcre.h | 3 +++ glib/update-pcre/Makefile.am | 1 + glib/update-pcre/Makefile.am-1 | 1 + glib/update-pcre/notdll.patch | 19 +++++++++++++++++++ glib/update-pcre/update.sh | 3 +++ 9 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 glib/update-pcre/notdll.patch diff --git a/ChangeLog b/ChangeLog index 6da10647..f94b20c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2007-03-15 Tor Lillqvist + + * glib/gnulib/Makefile.am (INCLUDES): Add -I$(top_srcdir)/glib so + that gregex.h finds . + + * 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 + + * glib/gtypes.h: Add comment to avoid misleading people with the + large number of digits in G_PI etc. (#404338) + 2007-03-15 Tor Lillqvist * config.h.win32.in: Update to match what configure produces. diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am index 96c20a17..2387885d 100644 --- a/glib/gnulib/Makefile.am +++ b/glib/gnulib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -DG_LOG_DOMAIN=\"GLib\" \ $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION noinst_LTLIBRARIES = libgnulib.la diff --git a/glib/gtypes.h b/glib/gtypes.h index 21b55e7c..eaeabd2a 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -93,6 +93,13 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str, /* Define some mathematical constants that aren't available * symbolically in some strict ISO C implementations. + * + * Note that the large number of digits used in these definitions + * doesn't imply that GLib or current computers in general would be + * able to handle floating point numbers with an accuracy like this. + * It's mostly an exercise in futility and future proofing. For + * extended precision floating point support, look somewhere else + * than GLib. */ #define G_E 2.7182818284590452353602874713526624977572470937000 #define G_LN2 0.69314718055994530941723212145817656807550013436026 diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am index 61f8aa29..928eb0f9 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 1b29a18f..f3285644 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". */ diff --git a/glib/update-pcre/Makefile.am b/glib/update-pcre/Makefile.am index ac7f82c1..57af29d1 100644 --- a/glib/update-pcre/Makefile.am +++ b/glib/update-pcre/Makefile.am @@ -4,5 +4,6 @@ EXTRA_DIST = \ Makefile.am-2 \ digitab.patch \ memory.patch \ + notdll.patch \ pcre_ucp_searchfuncs.c \ pcre_valid_utf8.c diff --git a/glib/update-pcre/Makefile.am-1 b/glib/update-pcre/Makefile.am-1 index fb71e28e..c26708e4 100644 --- a/glib/update-pcre/Makefile.am-1 +++ b/glib/update-pcre/Makefile.am-1 @@ -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/update-pcre/notdll.patch b/glib/update-pcre/notdll.patch new file mode 100644 index 00000000..951da2ba --- /dev/null +++ b/glib/update-pcre/notdll.patch @@ -0,0 +1,19 @@ +--- pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200 ++++ pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200 +@@ -60,6 +60,8 @@ + /* 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 +71,7 @@ + # endif + # endif + #endif ++#endif + + /* Otherwise, we use the standard "extern". */ + diff --git a/glib/update-pcre/update.sh b/glib/update-pcre/update.sh index a566e2db..3c7d13d9 100644 --- a/glib/update-pcre/update.sh +++ b/glib/update-pcre/update.sh @@ -128,6 +128,9 @@ 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 . -- 2.34.1