luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update so it applies again.

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2007-08-01 09:57:17 +00:00 committed by Tor Lillqvist
parent 75f974d1d9
commit 8c5493f019
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2007-08-01 Tor Lillqvist <tml@novell.com> 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 * glib/gutils.c (get_special_folder): Drop leftover use of a
union. union.

3
glib/pcre/pcre.h
View File

@ -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 export setting is defined in pcre_internal.h, which includes this file. So we
don't change an existing definition of PCRE_EXP_DECL. */ 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 #ifndef PCRE_EXP_DECL
# ifdef _WIN32 # ifdef _WIN32
# ifndef PCRE_STATIC # ifndef PCRE_STATIC
@ -58,6 +60,7 @@ don't change an existing definition of PCRE_EXP_DECL. */
# endif # endif
# endif # endif
#endif #endif
#endif
/* By default, we use the standard "extern" declarations. */ /* By default, we use the standard "extern" declarations. */

16
glib/update-pcre/notdll.patch
View File

@ -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
+++ 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 @@ @@ -51,13 +51,16 @@
/* Win32 uses DLL by default; it needs special stuff for exported functions export setting is defined in pcre_internal.h, which includes this file. So we
when building PCRE. */ don't change an existing definition of PCRE_EXP_DECL. */
+/* But don't do that when building as part of GLib */ +/* But don't do that when building as part of GLib */
+#if 0 +#if 0
#ifdef _WIN32 #ifndef PCRE_EXP_DECL
# ifdef PCRE_DEFINITION # ifdef _WIN32
# ifdef DLL_EXPORT # ifndef PCRE_STATIC
@@ -71,6 +71,7 @@ # define PCRE_EXP_DECL extern __declspec(dllimport)
# endif # endif
# endif # endif
#endif #endif
+#endif +#endif
/* Otherwise, we use the standard "extern". */ /* By default, we use the standard "extern" declarations. */