com php-src: stdint will be included in the win32 variant, so don't do it twice: phpdbg.h
| From: | Bob Weinand | Date: | Sat, 25 Oct 2014 11:01:17 +0000 |
| Subject: | com php-src: stdint will be included in the win32 variant, so don't do it twice: phpdbg.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82687@lists.php.net to get a copy of this message | ||
Commit: c1639b3e527e89e8199fafebfd4ff8e55b7f092c
Author: Anatol Belski <ab@php.net> Sat, 25 Oct 2014 13:01:17 +0200
Parents: 36399428919ef518bcd744e120e48c00610a8b86
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1639b3e527e89e8199fafebfd4ff8e55b7f092c
Log:
stdint will be included in the win32 variant, so don't do it twice
Changed paths:
M phpdbg.h
Diff:
diff --git a/phpdbg.h b/phpdbg.h
index 8c0dbb4..4147198 100644
--- a/phpdbg.h
+++ b/phpdbg.h
@@ -29,8 +29,12 @@
# define PHPDBG_API
#endif
-#include <stdint.h>
-#include <stddef.h>
+#ifndef PHP_WIN32
+# include <stdint.h>
+# include <stddef.h>
+#else
+# include "win32/php_stdint.h"
+#endif
#include "php.h"
#include "php_globals.h"
#include "php_variables.h"
@@ -50,7 +54,6 @@
#if defined(_WIN32) && !defined(__MINGW32__)
# include <windows.h>
# include "config.w32.h"
-# include "win32/php_stdint.h"
# undef strcasecmp
# undef strncasecmp
# define strcasecmp _stricmp