[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2011-05-13 Thread Scott MacVicar
scottmac Fri, 13 May 2011 13:51:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310991

Log:
Fix Windows build, this really should be in a patch file / README.

I'll fix this up later.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h

Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2011-05-13 13:47:50 UTC (rev 310990)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2011-05-13 13:51:07 UTC (rev 310991)
@@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */

-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2011-05-13 13:47:50 UTC 
(rev 310990)
+++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2011-05-13 13:51:07 UTC 
(rev 310991)
@@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */

-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2011-05-13 Thread Pierre Joye
Patch has been sent upstream. That's why we have it as patch here and a
readme that should be read :)

On 13 May 2011 15:51, Scott MacVicar scott...@php.net wrote:
 scottmac Fri, 13 May 2011 13:51:07 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=310991

 Log:
 Fix Windows build, this really should be in a patch file / README.

 I'll fix this up later.

 Changed paths:
 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
 U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h

 Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
 ===
 --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
2011-05-13 13:47:50 UTC (rev 310990)
 +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
2011-05-13 13:51:07 UTC (rev 310991)
 @@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be
set
 by configure. */

 -#if HAVE_STDINT_H
 +#ifdef PHP_WIN32
 +#include win32/php_stdint.h
 +#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

 Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
 ===
 --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50
UTC (rev 310990)
 +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07
UTC (rev 310991)
 @@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be
set
 by configure. */

 -#if HAVE_STDINT_H
 +#ifdef PHP_WIN32
 +#include win32/php_stdint.h
 +#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2011-05-13 Thread Scott MacVicar
I didn't see a readme, i patched upgrade-pcre.php for one and i'll have it 
patch the other part if needed.

On May 13, 2011, at 7:18 AM, Pierre Joye wrote:

 Patch has been sent upstream. That's why we have it as patch here and a 
 readme that should be read :)
 
 On 13 May 2011 15:51, Scott MacVicar scott...@php.net wrote:
  scottmac Fri, 13 May 2011 13:51:07 +
  
  Revision: http://svn.php.net/viewvc?view=revisionrevision=310991
  
  Log:
  Fix Windows build, this really should be in a patch file / README.
  
  I'll fix this up later.
  
  Changed paths:
  U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
  U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
  
  Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
  ===
  --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
  2011-05-13 13:47:50 UTC (rev 310990)
  +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
  2011-05-13 13:51:07 UTC (rev 310991)
  @@ -192,7 +192,9 @@
  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be 
  set
  by configure. */
  
  -#if HAVE_STDINT_H
  +#ifdef PHP_WIN32
  +#include win32/php_stdint.h
  +#elif HAVE_STDINT_H
  #include stdint.h
  #elif HAVE_INTTYPES_H
  #include inttypes.h
  
  Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
  ===
  --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2011-05-13 
  13:47:50 UTC (rev 310990)
  +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2011-05-13 
  13:51:07 UTC (rev 310991)
  @@ -192,7 +192,9 @@
  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be 
  set
  by configure. */
  
  -#if HAVE_STDINT_H
  +#ifdef PHP_WIN32
  +#include win32/php_stdint.h
  +#elif HAVE_STDINT_H
  #include stdint.h
  #elif HAVE_INTTYPES_H
  #include inttypes.h
  
 



[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2010-12-24 Thread Gustavo André dos Santos Lopes
cataphract   Fri, 24 Dec 2010 19:01:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306625

Log:
- Fix PCRE build on Windows; closes bug #53606.

Bug: http://bugs.php.net/53606 (Open) PCRE Compile Fails, Can't open stdint.h 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h

Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-12-24 15:03:29 UTC (rev 306624)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-12-24 19:01:25 UTC (rev 306625)
@@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */

-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-12-24 15:03:29 UTC 
(rev 306624)
+++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-12-24 19:01:25 UTC 
(rev 306625)
@@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */

-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2010-04-01 Thread Pierre Joye
pajoye   Thu, 01 Apr 2010 10:34:05 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=297262

Log:
- fix build

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h

Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-04-01 10:31:52 UTC (rev 297261)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-04-01 10:34:05 UTC (rev 297262)
@@ -191,8 +191,9 @@
 stdint.h is available, include it; it may define INT64_MAX. Systems that do not
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */
-
-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-04-01 10:31:52 UTC 
(rev 297261)
+++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-04-01 10:34:05 UTC 
(rev 297262)
@@ -192,7 +192,9 @@
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by configure. */

-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#elif HAVE_STDINT_H
 #include stdint.h
 #elif HAVE_INTTYPES_H
 #include inttypes.h

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h

2010-01-21 Thread Pierre Joye
pajoye   Thu, 21 Jan 2010 23:23:17 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293825

Log:
- fix win build, use bundled stdint

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h

Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-01-21 22:58:08 UTC (rev 293824)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h   
2010-01-21 23:23:17 UTC (rev 293825)
@@ -192,7 +192,11 @@
 may be set by configure. */

 #if HAVE_STDINT_H
-#include stdint.h
+# ifdef PHP_WIN32
+#  include win32/php_stdint.h
+# else
+#  include stdint.h
+# endif
 #endif

 #if defined INT64_MAX || defined int64_t

Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
===
--- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-01-21 22:58:08 UTC 
(rev 293824)
+++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h  2010-01-21 23:23:17 UTC 
(rev 293825)
@@ -192,7 +192,11 @@
 may be set by configure. */

 #if HAVE_STDINT_H
-#include stdint.h
+# ifdef PHP_WIN32
+#  include win32/php_stdint.h
+# else
+#  include stdint.h
+# endif
 #endif

 #if defined INT64_MAX || defined int64_t

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