glib/glib/update-pcre/notdll.patch
Tor Lillqvist 8c5493f019 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
2007-08-01 09:57:17 +00:00

20 lines
552 B
Diff

--- pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200
+++ pcre/pcre.h 2006-07-05 13:28:01.000000000 +0200
@@ -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
#ifndef PCRE_EXP_DECL
# ifdef _WIN32
# ifndef PCRE_STATIC
# define PCRE_EXP_DECL extern __declspec(dllimport)
# endif
# endif
#endif
+#endif
/* By default, we use the standard "extern" declarations. */