+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)
+
2007-03-15 Tor Lillqvist <tml@novell.com>
* config.h.win32.in: Update to match what configure produces.
## 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
/* 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
-I$(top_srcdir)/glib \
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \
+ -DGLIB_COMPILATION \
$(DEPRECATED_FLAGS)\
$(WARN_CFLAGS) \
$(PCRE_WARN_CFLAGS) \
/* 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
# endif
# endif
#endif
+#endif
/* Otherwise, we use the standard "extern". */
Makefile.am-2 \
digitab.patch \
memory.patch \
+ notdll.patch \
pcre_ucp_searchfuncs.c \
pcre_valid_utf8.c
-I$(top_srcdir)/glib \
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \
+ -DGLIB_COMPILATION \
$(DEPRECATED_FLAGS)\
$(WARN_CFLAGS) \
$(PCRE_WARN_CFLAGS) \
--- /dev/null
+--- 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". */
+
# 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 .