[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F2/NEWS_branches/PHP=5F5=5F2/ext/pcre/pcrel
From:       Sriram_Natarajan <srinatar () php ! net>
Date:       2010-07-27 21:42:22
Message-ID: svn-srinatar-1280266942-301625-1142247098 () svn ! php ! net
[Download RAW message or body]

srinatar                                 Tue, 27 Jul 2010 21:42:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301625

Log:
- Fixed bug #52436 (Compile error in pcre if systems do not have stdint.h)
# PCRE's config.h can very well reuse the definitions made available from
# PHP's configure script output available within php_config.h

Bug: http://bugs.php.net/52436 (Assigned) Compile error if systems do not have stdint.h
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/config.h
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h
    U   php/php-src/trunk/ext/pcre/pcrelib/config.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS	2010-07-27 21:09:56 UTC (rev 301624)
+++ php/php-src/branches/PHP_5_2/NEWS	2010-07-27 21:42:22 UTC (rev 301625)
@@ -2,6 +2,8 @@
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.2.15

+- Fixed bug #52436 (Compile error if systems do not have stdint.h)
+  (Sriram Natarajan)

 22 Jul 2010, PHP 5.2.14
 - Reverted bug fix #49521 (PDO fetchObject sets values before calling

Modified: php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/config.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/config.h	2010-07-27 21:09:56 UTC (rev 301624)
+++ php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/config.h	2010-07-27 21:42:22 UTC (rev 301625)
@@ -1,5 +1,7 @@

 #include <php_compat.h>
+#include <php_config.h>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
 #undef PACKAGE_TARNAME
@@ -8,6 +10,8 @@
 #define SUPPORT_UCP
 #define SUPPORT_UTF8

+/* Exclude these below definitions when building within PHP */
+#ifndef ZEND_API

 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -179,6 +183,9 @@
 /* Define to 1 if you have `_strtoi64'. */
 /* #undef HAVE__STRTOI64 */

+/* Exclude these above definitions when building within PHP */
+#endif
+
 /* The value of LINK_SIZE determines the number of bytes used to store links
    as offsets within the compiled regex. The default is 2, which allows for
    compiled patterns up to 64K long. This covers the vast majority of cases.

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS	2010-07-27 21:09:56 UTC (rev 301624)
+++ php/php-src/branches/PHP_5_3/NEWS	2010-07-27 21:42:22 UTC (rev 301625)
@@ -2,6 +2,9 @@
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.3.4

+- Fixed bug #52436 (Compile error if systems do not have stdint.h)
+  (Sriram Natarajan)
+
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
 - Upgraded bundled PCRE to version 8.02. (Ilia)

Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h	2010-07-27 21:09:56 UTC (rev 301624)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h	2010-07-27 21:42:22 UTC (rev 301625)
@@ -1,5 +1,7 @@

 #include <php_compat.h>
+#include <php_config.h>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
 #undef PACKAGE_TARNAME
@@ -18,6 +20,8 @@
 # define PCRE_EXP_DATA_DEFN	__attribute__ ((visibility("default")))
 #endif

+/* Exclude these below definitions when building within PHP */
+#ifndef ZEND_API

 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -189,6 +193,9 @@
 /* Define to 1 if you have `_strtoi64'. */
 /* #undef HAVE__STRTOI64 */

+/* Exclude these above definitions when building within PHP */
+#endif
+
 /* The value of LINK_SIZE determines the number of bytes used to store links
    as offsets within the compiled regex. The default is 2, which allows for
    compiled patterns up to 64K long. This covers the vast majority of cases.

Modified: php/php-src/trunk/ext/pcre/pcrelib/config.h
===================================================================
--- php/php-src/trunk/ext/pcre/pcrelib/config.h	2010-07-27 21:09:56 UTC (rev 301624)
+++ php/php-src/trunk/ext/pcre/pcrelib/config.h	2010-07-27 21:42:22 UTC (rev 301625)
@@ -1,5 +1,7 @@

 #include <php_compat.h>
+#include <php_config.h>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
 #undef PACKAGE_TARNAME
@@ -18,6 +20,8 @@
 # define PCRE_EXP_DATA_DEFN	__attribute__ ((visibility("default")))
 #endif

+/* Exclude these below definitions when building within PHP */
+#ifndef ZEND_API

 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -189,6 +193,9 @@
 /* Define to 1 if you have `_strtoi64'. */
 /* #undef HAVE__STRTOI64 */

+/* Exclude these above definitions when building within PHP */
+#endif
+
 /* The value of LINK_SIZE determines the number of bytes used to store links
    as offsets within the compiled regex. The default is 2, which allows for
    compiled patterns up to 64K long. This covers the vast majority of cases.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic