luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add -I$(top_srcdir)/glib so that gregex.h finds <glib.h>.

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2007-03-15 15:17:17 +00:00 committed by Tor Lillqvist
parent 851c7067aa
commit b91d083561
9 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
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> 2007-03-15 Tor Lillqvist <tml@novell.com>
* config.h.win32.in: Update to match what configure produces. * config.h.win32.in: Update to match what configure produces.

2
glib/gnulib/Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## 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 $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
noinst_LTLIBRARIES = libgnulib.la noinst_LTLIBRARIES = libgnulib.la

7
glib/gtypes.h
View File

@ -93,6 +93,13 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
/* Define some mathematical constants that aren't available /* Define some mathematical constants that aren't available
* symbolically in some strict ISO C implementations. * 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_E 2.7182818284590452353602874713526624977572470937000
#define G_LN2 0.69314718055994530941723212145817656807550013436026 #define G_LN2 0.69314718055994530941723212145817656807550013436026

1
glib/pcre/Makefile.am
View File

@ -16,6 +16,7 @@ INCLUDES = \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \
$(DEPRECATED_FLAGS)\ $(DEPRECATED_FLAGS)\
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(PCRE_WARN_CFLAGS) \ $(PCRE_WARN_CFLAGS) \

3
glib/pcre/pcre.h
View File

@ -60,6 +60,8 @@ circumstance. */
/* Win32 uses DLL by default; it needs special stuff for exported functions /* Win32 uses DLL by default; it needs special stuff for exported functions
when building PCRE. */ when building PCRE. */
/* But don't do that when building as part of GLib */
#if 0
#ifdef _WIN32 #ifdef _WIN32
# ifdef PCRE_DEFINITION # ifdef PCRE_DEFINITION
# ifdef DLL_EXPORT # ifdef DLL_EXPORT
@ -71,6 +73,7 @@ when building PCRE. */
# endif # endif
# endif # endif
#endif #endif
#endif
/* Otherwise, we use the standard "extern". */ /* Otherwise, we use the standard "extern". */

1
glib/update-pcre/Makefile.am
View File

@ -4,5 +4,6 @@ EXTRA_DIST = \
Makefile.am-2 \ Makefile.am-2 \
digitab.patch \ digitab.patch \
memory.patch \ memory.patch \
notdll.patch \
pcre_ucp_searchfuncs.c \ pcre_ucp_searchfuncs.c \
pcre_valid_utf8.c pcre_valid_utf8.c

1
glib/update-pcre/Makefile.am-1
View File

@ -16,6 +16,7 @@ INCLUDES = \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \
$(DEPRECATED_FLAGS)\ $(DEPRECATED_FLAGS)\
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(PCRE_WARN_CFLAGS) \ $(PCRE_WARN_CFLAGS) \

19
glib/update-pcre/notdll.patch Normal file
View File

@ -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". */

3
glib/update-pcre/update.sh
View File

@ -128,6 +128,9 @@ cp $PCRE/COPYING .
# Use glib for memory allocation. # Use glib for memory allocation.
patch > /dev/null < $IN/memory.patch 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. # Copy the modified version of pcre_valid_utf8.c.
cp $IN/pcre_valid_utf8.c . cp $IN/pcre_valid_utf8.c .