diff options
| author | Anatoliy Belsky <ab@php.net> | 2013-01-15 22:39:49 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2013-01-15 22:39:49 +0100 |
| commit | 18e160411e364ee02eff12e8ab516be9911be393 (patch) | |
| tree | 4e068cd1e9cc1cc50e822edbe741ebe2b2427006 /ext/standard/string.c | |
| parent | dba22c08640b02e68bfea68440246fec1fb7459d (diff) | |
| parent | 9498cf6194496a1dd6b400e3e9a85ff005dc3dcd (diff) | |
| download | php-git-18e160411e364ee02eff12e8ab516be9911be393.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 3039c14d5d..e245ce3fb6 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -23,7 +23,11 @@ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ #include <stdio.h> -#include <stdint.h> +#ifdef PHP_WIN32 +# include "win32/php_stdint.h" +#else +# include <stdint.h> +#endif #include "php.h" #include "php_rand.h" #include "php_string.h" |