Re: svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h
| From: | Scott MacVicar | Date: | Fri, 13 May 2011 15:15:07 +0000 |
| Subject: | Re: svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h | ||
| References: | 1 2 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-64910@lists.php.net to get a copy of this message | ||
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" <scottmac@php.net> wrote:
> > scottmac Fri, 13 May 2011 13:51:07 +0000
> >
> > Revision:
> > http://svn.php.net/viewvc?view=revision&revision=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>
> >
>