diff options
| author | Anatol Belski <ab@php.net> | 2014-08-21 09:09:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-21 09:09:29 +0200 |
| commit | d3ca974ff592d9f7789b6d6f5bb48a32b7d5eca7 (patch) | |
| tree | e210d55601048ca513ff3fb82d9b412367d5dfcf /win32 | |
| parent | 89d3a356d11aab0b1052cbdb036cede278a5eec2 (diff) | |
| parent | 713e9a7eaa8344061aad0883829c42a651691c34 (diff) | |
| download | php-git-d3ca974ff592d9f7789b6d6f5bb48a32b7d5eca7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
avoid clash when stdint.h was included after win32/php_stdint.h
Diffstat (limited to 'win32')
| -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 |