diff options
| author | Anatol Belski <ab@php.net> | 2014-08-07 15:21:42 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-07 15:21:42 +0200 |
| commit | 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec (patch) | |
| tree | 57e853ee42b22bccecdcaee4d24c7ecd6a243744 | |
| parent | 0753c22e76f5b7e38aef52eef1169458710c7e5f (diff) | |
| parent | 7189039d650de1417e4e580865b1e77b39e3da55 (diff) | |
| download | php-git-58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
wrap int8_t and int16_t with #ifdef to avoid possible clashes
| -rw-r--r-- | win32/php_stdint.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/php_stdint.h b/win32/php_stdint.h index 5df1df4777..0d63615c6b 100644 --- a/win32/php_stdint.h +++ b/win32/php_stdint.h @@ -66,8 +66,12 @@ // 7.18.1 Integer types // 7.18.1.1 Exact-width integer types +#ifndef int8_t typedef __int8 int8_t; +#endif +#ifndef int16_t typedef __int16 int16_t; +#endif #ifndef int32_t typedef __int32 int32_t; #endif |