cvs: php-src(PHP_5_3) /ext/pcre upgrade-pcre.php /ext/pcre/pcrelib config.h
| From: | Nuno Lopes | Date: | Wed, 10 Dec 2008 10:16:14 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/pcre upgrade-pcre.php /ext/pcre/pcrelib config.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54833@lists.php.net to get a copy of this message | ||
nlopess Wed Dec 10 10:16:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre upgrade-pcre.php
/php-src/ext/pcre/pcrelib config.h
Log:
export the pcre API when compiling with gcc 4. this fixes e.g. the linkage of APC (reported by
shire)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/upgrade-pcre.php?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/pcre/upgrade-pcre.php
diff -u php-src/ext/pcre/upgrade-pcre.php:1.1.2.3.2.1 php-src/ext/pcre/upgrade-pcre.php:1.1.2.3.2.2
--- php-src/ext/pcre/upgrade-pcre.php:1.1.2.3.2.1 Mon Jan 14 09:40:29 2008
+++ php-src/ext/pcre/upgrade-pcre.php Wed Dec 10 10:16:14 2008
@@ -106,6 +106,16 @@
#define SUPPORT_UCP
#define SUPPORT_UTF8
+#if defined(__GNUC__) && __GNUC__ >= 4
+# ifdef __cplusplus
+# define PCRE_EXP_DECL extern "C" __attribute__ ((visibility("default")))
+# else
+# define PCRE_EXP_DECL extern __attribute__ ((visibility("default")))
+# endif
+# define PCRE_EXP_DEFN __attribute__ ((visibility("default")))
+# define PCRE_EXP_DATA_DEFN __attribute__ ((visibility("default")))
+#endif
+
';
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/config.h?r1=1.2.2.4.2.5&r2=1.2.2.4.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/config.h
diff -u php-src/ext/pcre/pcrelib/config.h:1.2.2.4.2.5 php-src/ext/pcre/pcrelib/config.h:1.2.2.4.2.6
--- php-src/ext/pcre/pcrelib/config.h:1.2.2.4.2.5 Tue Sep 9 07:55:08 2008
+++ php-src/ext/pcre/pcrelib/config.h Wed Dec 10 10:16:14 2008
@@ -8,6 +8,16 @@
#define SUPPORT_UCP
#define SUPPORT_UTF8
+#if defined(__GNUC__) && __GNUC__ >= 4
+# ifdef __cplusplus
+# define PCRE_EXP_DECL extern "C" __attribute__ ((visibility("default")))
+# else
+# define PCRE_EXP_DECL extern __attribute__ ((visibility("default")))
+# endif
+# define PCRE_EXP_DEFN __attribute__ ((visibility("default")))
+# define PCRE_EXP_DATA_DEFN __attribute__ ((visibility("default")))
+#endif
+
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */