Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2008-09-03 04:00:32 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2008-09-03 04:00:32 +0400
commit33ac84e888ee3e3217f15f955e1b389a9c4bb230 (patch)
tree0b14ea4737fc965e851eb83dc955b7cdf2e9a978 /source/blender/blenloader/BLO_sys_types.h
parentfe93743518b32fbb43ec8f3b11640672867a3937 (diff)
Compile fixes (reported by broken)
Diffstat (limited to 'source/blender/blenloader/BLO_sys_types.h')
-rw-r--r--source/blender/blenloader/BLO_sys_types.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index a9d29375eac..49155260b31 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -49,6 +49,7 @@ extern "C" {
/* The __intXX are built-in types of the visual complier! So we don't
* need to include anything else here. */
+
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
@@ -59,13 +60,23 @@ typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
+#ifndef _INTPTR_T_DEFINED
#ifdef _WIN64
typedef __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
#else
typedef long intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
typedef unsigned long uintptr_t;
#endif
+#define _UINTPTR_T_DEFINED
+#endif
#elif defined(__linux__)
@@ -87,6 +98,7 @@ typedef unsigned long uintptr_t;
#endif /* ifdef platform for types */
+
#ifdef _WIN32
#define htonl(x) correctByteOrder(x)
#define ntohl(x) correctByteOrder(x)