[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16343] trunk/blender: Compile fixes ( reported by broken)

Daniel Genrich daniel.genrich at gmx.net
Wed Sep 3 02:00:36 CEST 2008


Revision: 16343
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16343
Author:   genscher
Date:     2008-09-03 02:00:32 +0200 (Wed, 03 Sep 2008)

Log Message:
-----------
Compile fixes (reported by broken)

Modified Paths:
--------------
    trunk/blender/intern/opennl/superlu/BLO_sys_types.h
    trunk/blender/source/blender/blenloader/BLO_sys_types.h

Modified: trunk/blender/intern/opennl/superlu/BLO_sys_types.h
===================================================================
--- trunk/blender/intern/opennl/superlu/BLO_sys_types.h	2008-09-02 22:13:07 UTC (rev 16342)
+++ trunk/blender/intern/opennl/superlu/BLO_sys_types.h	2008-09-03 00:00:32 UTC (rev 16343)
@@ -54,6 +54,7 @@
 /* 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;
@@ -102,6 +103,7 @@
 
 #endif /* ifdef platform for types */
 
+
 #ifdef _WIN32
 #ifndef htonl
 #define htonl(x) correctByteOrder(x)

Modified: trunk/blender/source/blender/blenloader/BLO_sys_types.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_sys_types.h	2008-09-02 22:13:07 UTC (rev 16342)
+++ trunk/blender/source/blender/blenloader/BLO_sys_types.h	2008-09-03 00:00:32 UTC (rev 16343)
@@ -49,6 +49,7 @@
 /* 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 __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 
+#ifndef _INTPTR_T_DEFINED
 #ifdef _WIN64
 typedef __int64 intptr_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 long intptr_t;
 typedef unsigned long uintptr_t;
 #endif
+#define _UINTPTR_T_DEFINED
+#endif
 
 #elif defined(__linux__)
 
@@ -87,6 +98,7 @@
 
 #endif /* ifdef platform for types */
 
+
 #ifdef _WIN32
 #define htonl(x) correctByteOrder(x)
 #define ntohl(x) correctByteOrder(x)





More information about the Bf-blender-cvs mailing list