Update so it applies again.

2007-08-01  Tor Lillqvist  <tml@novell.com>

	* glib/update-pcre/notdll.patch: Update so it applies again.

	* glib/pcre/pcre.h: Corresponding change.

svn path=/trunk/; revision=5662

diff --git a/ChangeLog b/ChangeLog
index 17e4e627a07b3b481105572f72736c6fbbb7253f..92a80fa17e96309dc5f7a816e9d089bb67ea52cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-01  Tor Lillqvist  <tml@novell.com>
 
+       * glib/update-pcre/notdll.patch: Update so it applies again.
+
+       * glib/pcre/pcre.h: Corresponding change.
+
        * glib/gutils.c (get_special_folder): Drop leftover use of a
        union.
 

diff --git a/glib/pcre/pcre.h b/glib/pcre/pcre.h
index 445ac977e7148851ce5f68f62d94cf68ded33de1..7ed12beb951873a868e4108f87227fde9a20247d 100644 (file)
--- a/glib/pcre/pcre.h
+++ b/glib/pcre/pcre.h
@@ -51,6 +51,8 @@ imported have to be identified as such. When building PCRE, the appropriate
 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
@@ -58,6 +60,7 @@ don't change an existing definition of PCRE_EXP_DECL. */
 #    endif
 #  endif
 #endif
+#endif
 
 /* By default, we use the standard "extern" declarations. */
 

diff --git a/glib/update-pcre/notdll.patch b/glib/update-pcre/notdll.patch
index 951da2ba1f688ca17f2f68ba1379e5e02054c623..511e76aedac1d0662a7326fd561af498bf29c049 100644 (file)
--- a/glib/update-pcre/notdll.patch
+++ b/glib/update-pcre/notdll.patch
@@ -1,19 +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. */
+@@ -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
- #ifdef _WIN32
- #  ifdef PCRE_DEFINITION
- #    ifdef DLL_EXPORT
-@@ -71,6 +71,7 @@
+ #ifndef PCRE_EXP_DECL
+ #  ifdef _WIN32
+ #    ifndef PCRE_STATIC
+ #      define PCRE_EXP_DECL extern __declspec(dllimport)
  #    endif
  #  endif
  #endif
 +#endif
  
- /* Otherwise, we use the standard "extern". */
+ /* By default, we use the standard "extern" declarations. */