summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/os-win32
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:15 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:15 -0800
commit1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch)
tree4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /JavaScriptCore/os-win32
parent9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff)
downloadexternal_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip
external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz
external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'JavaScriptCore/os-win32')
-rw-r--r--JavaScriptCore/os-win32/stdint.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/JavaScriptCore/os-win32/stdint.h b/JavaScriptCore/os-win32/stdint.h
index 48ae474..efab2ae 100644
--- a/JavaScriptCore/os-win32/stdint.h
+++ b/JavaScriptCore/os-win32/stdint.h
@@ -29,6 +29,8 @@
#error "This stdint.h file should only be compiled under Windows"
#endif
+#include <limits.h>
+
typedef unsigned char uint8_t;
typedef signed char int8_t;
typedef unsigned short uint16_t;
@@ -38,6 +40,16 @@ typedef int int32_t;
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+#ifndef SIZE_MAX
+#ifdef _WIN64
+#define SIZE_MAX _UI64_MAX
+#else
+#define SIZE_MAX _UI32_MAX
+#endif
+#endif
+#endif
+
#ifndef CASSERT
#define CASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1];
#endif