From acea91b18c26149f753a037b96bed9e2b61bfdd1 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 12 Aug 2013 13:39:17 +0200 Subject: Fixes to unified stdint usage This recalls 14caf174ff219376e4f1234bd297ffe973cc416e --- main/php_stdint.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'main/php_stdint.h') 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 -- cgit v1.2.1