Revision: 16156
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16156
Author: ben2610
Date: 2008-08-18 00:28:30 +0200 (Mon, 18 Aug 2008)
Log Message:
-----------
Fix compile problem in MSVC after Win64 patch
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/BLO_sys_types.h
trunk/blender/intern/opennl/superlu/BLO_sys_types.h
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
trunk/blender/source/blender/src/buttons_scene.c
Modified: trunk/blender/intern/guardedalloc/BLO_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/BLO_sys_types.h 2008-08-17 19:58:13 UTC
(rev 16155)
+++ trunk/blender/intern/guardedalloc/BLO_sys_types.h 2008-08-17 22:28:30 UTC
(rev 16156)
@@ -69,13 +69,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__)
@@ -94,8 +104,12 @@
#endif /* ifdef platform for types */
#ifdef _WIN32
+#ifndef htonl
#define htonl(x) correctByteOrder(x)
+#endif
+#ifndef ntohl
#define ntohl(x) correctByteOrder(x)
+#endif
#elif defined (__FreeBSD__) || defined (__OpenBSD__)
#include <sys/param.h>
#elif defined (__APPLE__)
Modified: trunk/blender/intern/opennl/superlu/BLO_sys_types.h
===================================================================
--- trunk/blender/intern/opennl/superlu/BLO_sys_types.h 2008-08-17 19:58:13 UTC
(rev 16155)
+++ trunk/blender/intern/opennl/superlu/BLO_sys_types.h 2008-08-17 22:28:30 UTC
(rev 16156)
@@ -69,13 +69,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__)
@@ -94,8 +104,12 @@
#endif /* ifdef platform for types */
#ifdef _WIN32
+#ifndef htonl
#define htonl(x) correctByteOrder(x)
+#endif
+#ifndef ntohl
#define ntohl(x) correctByteOrder(x)
+#endif
#elif defined (__FreeBSD__) || defined (__OpenBSD__)
#include <sys/param.h>
#elif defined (__APPLE__)
Modified: trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
2008-08-17 19:58:13 UTC (rev 16155)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
2008-08-17 22:28:30 UTC (rev 16156)
@@ -35,7 +35,8 @@
#endif
#include "BLO_sys_types.h" // for intptr_t support
-
+#undef ntohl
+#undef htonl
typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int
lineNum);
typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int
lineNum);
typedef void (CloseFn)(LogImageFile* logImage);
Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c 2008-08-17 19:58:13 UTC
(rev 16155)
+++ trunk/blender/source/blender/src/buttons_scene.c 2008-08-17 22:28:30 UTC
(rev 16156)
@@ -33,6 +33,7 @@
#include <string.h>
#include "MEM_guardedalloc.h"
+#include "BLO_sys_types.h" // for intptr_t support
#include "DNA_node_types.h"
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
