diff options
| author | Anatol Belski <ab@php.net> | 2014-08-21 09:09:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-21 09:09:47 +0200 |
| commit | 333f093010a5c3d45d16f45d40b3515e4029bad0 (patch) | |
| tree | 3e9757f1b9a8302ceaf09e3dcb8193272671fc76 | |
| parent | 4c6fb627027b2a048bbcd47876eef1dfbddcc59a (diff) | |
| parent | d3ca974ff592d9f7789b6d6f5bb48a32b7d5eca7 (diff) | |
| download | php-git-333f093010a5c3d45d16f45d40b3515e4029bad0.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
avoid clash when stdint.h was included after win32/php_stdint.h
| -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 0d63615c6b..cb5ad17061 100644 --- a/win32/php_stdint.h +++ b/win32/php_stdint.h @@ -36,6 +36,10 @@ #ifndef _MSC_STDINT_H_ // [ #define _MSC_STDINT_H_ +#ifndef _STDINT +# define _STDINT +#endif + #if _MSC_VER > 1000 #pragma once #endif |