com php-src: wrap int8_t and int16_t with # ifdef to avoid possible clashes: win32/php_st dint.h
| From: | Anatol Belski | Date: | Thu, 07 Aug 2014 13:20:17 +0000 |
| Subject: | com php-src: wrap int8_t and int16_t with # ifdef to avoid possible clashes: win32/php_st dint.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79777@lists.php.net to get a copy of this message | ||
Commit: 7189039d650de1417e4e580865b1e77b39e3da55
Author: Anatol Belski <ab@php.net> Thu, 7 Aug 2014 15:20:17 +0200
Parents: 7df4087b98711b656360c1e5832dfc478ab04b42
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7189039d650de1417e4e580865b1e77b39e3da55
Log:
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Changed paths:
M win32/php_stdint.h
Diff:
diff --git a/win32/php_stdint.h b/win32/php_stdint.h
index 5df1df4..0d63615 100644
--- a/win32/php_stdint.h
+++ b/win32/php_stdint.h
@@ -66,8 +66,12 @@
// 7.18.1 Integer types
// 7.18.1.1 Exact-width integer types
+#ifndef int8_t
typedef __int8 int8_t;
+#endif
+#ifndef int16_t
typedef __int16 int16_t;
+#endif
#ifndef int32_t
typedef __int32 int32_t;
#endif