diff options
| author | Anatol Belski <ab@php.net> | 2013-08-12 13:39:17 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-08-12 13:39:17 +0200 |
| commit | acea91b18c26149f753a037b96bed9e2b61bfdd1 (patch) | |
| tree | 270dcc294bc7ab12b2180f2efe7678baac860a16 /main/php_stdint.h | |
| parent | 52dac3e8cda94c8f38287ec3c437d9450b31b527 (diff) | |
| download | php-git-acea91b18c26149f753a037b96bed9e2b61bfdd1.tar.gz | |
Fixes to unified stdint usage
This recalls 14caf174ff219376e4f1234bd297ffe973cc416e
Diffstat (limited to 'main/php_stdint.h')
| -rw-r--r-- | main/php_stdint.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/php_stdint.h b/main/php_stdint.h index c8300d949e..87edb0fde0 100644 --- a/main/php_stdint.h +++ b/main/php_stdint.h @@ -19,8 +19,16 @@ #ifndef PHP_STDINT_H #define PHP_STDINT_H -#if PHP_WIN32 -# include "win32/php_stdint.h" +#if defined(_MSC_VER) +/* Make sure the regular stdint.h wasn't included already and prevent it to be + included afterwards. Though if some other library needs some stuff from + stdint.h included afterwards and misses it, we'd have to extend ours. On + the other hand, if stdint.h was included before, some conflicts might + happen so we'd likewise have to fix ours. */ +# if !defined(_STDINT) +# define _STDINT +# include "win32/php_stdint.h" +# endif # define HAVE_INT8_T 1 # define HAVE_UINT8_T 1 # define HAVE_INT16_T 1 |