summaryrefslogtreecommitdiff
path: root/win32/php_stdint.h
diff options
context:
space:
mode:
authorGeorge Wang <gwang@php.net>2014-09-03 11:28:30 -0400
committerGeorge Wang <gwang@php.net>2014-09-03 11:28:30 -0400
commitb16929ca7294fb047e63eb6c04d715d980a50c47 (patch)
treee8ccc6acd38dbf670380cccc500100279d74f53d /win32/php_stdint.h
parentbba16dde5ded45802543712bb3b9fe6e93b10751 (diff)
parent9266227402f50e1ad9953952b68a5ff3a25806b0 (diff)
downloadphp-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'win32/php_stdint.h')
-rw-r--r--win32/php_stdint.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/win32/php_stdint.h b/win32/php_stdint.h
index 5df1df4777..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
@@ -66,8 +70,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