<div dir="ltr">Hi,<br><br>This is causing major compiling problems here on Win32 (XP).<br>- using scons/mingw (i.e. gcc 3.4.4, scons 0.96.1):<br>compiling breaks down in guardedmalloc. It seems that somehow, uintptr_t doesn't get defined for some or rather reason. There are likely many more such places<br>
<br>- using cmake/mingw (I've made some local patches to make this work at all):<br>compiling breaks down in bf_kernel with similar errors<br><br>Regards,<br>Joshua<br><br><br><br><br><div class="gmail_quote">On Mon, Aug 18, 2008 at 5:08 AM, Daniel Genrich <span dir="ltr"><<a href="mailto:daniel.genrich@gmx.net">daniel.genrich@gmx.net</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Revision: 16147<br>
<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16147" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16147</a><br>
Author: genscher<br>
Date: 2008-08-17 19:08:00 +0200 (Sun, 17 Aug 2008)<br>
<br>
Log Message:<br>
-----------<br>
Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported!<br>
<br>
Modified Paths:<br>
--------------<br>
trunk/blender/intern/guardedalloc/intern/mallocn.c<br>
trunk/blender/intern/guardedalloc/intern/mmap_win.c<br>
trunk/blender/intern/guardedalloc/mmap_win.h<br>
trunk/blender/intern/opennl/superlu/smemory.c<br>
trunk/blender/release/datafiles/datatoc.c<br>
trunk/blender/source/blender/blenkernel/BKE_customdata.h<br>
trunk/blender/source/blender/blenkernel/BKE_endian.h<br>
trunk/blender/source/blender/blenkernel/BKE_utildefines.h<br>
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c<br>
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c<br>
trunk/blender/source/blender/blenkernel/intern/cloth.c<br>
trunk/blender/source/blender/blenkernel/intern/displist.c<br>
trunk/blender/source/blender/blenkernel/intern/image.c<br>
trunk/blender/source/blender/blenkernel/intern/implicit.c<br>
trunk/blender/source/blender/blenlib/BLI_editVert.h<br>
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c<br>
trunk/blender/source/blender/blenlib/intern/fileops.c<br>
trunk/blender/source/blender/blenlib/intern/psfont.c<br>
trunk/blender/source/blender/blenlib/intern/util.c<br>
trunk/blender/source/blender/blenpluginapi/intern/pluginapi.c<br>
trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c<br>
trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c<br>
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h<br>
trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c<br>
trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.h<br>
trunk/blender/source/blender/imbuf/intern/scaling.c<br>
trunk/blender/source/blender/include/BIF_meshtools.h<br>
trunk/blender/source/blender/makesdna/intern/makesdna.c<br>
trunk/blender/source/blender/radiosity/CMakeLists.txt<br>
trunk/blender/source/blender/radiosity/SConscript<br>
trunk/blender/source/blender/radiosity/intern/source/Makefile<br>
trunk/blender/source/blender/radiosity/intern/source/radnode.c<br>
trunk/blender/source/blender/radiosity/intern/source/radpreprocess.c<br>
trunk/blender/source/blender/render/CMakeLists.txt<br>
trunk/blender/source/blender/render/SConscript<br>
trunk/blender/source/blender/render/intern/include/render_types.h<br>
trunk/blender/source/blender/render/intern/source/occlusion.c<br>
trunk/blender/source/blender/render/intern/source/pipeline.c<br>
trunk/blender/source/blender/render/intern/source/rendercore.c<br>
trunk/blender/source/blender/render/intern/source/shadbuf.c<br>
trunk/blender/source/blender/render/intern/source/strand.c<br>
trunk/blender/source/blender/render/intern/source/zbuf.c<br>
trunk/blender/source/blender/src/buttons_editing.c<br>
trunk/blender/source/blender/src/buttons_scene.c<br>
trunk/blender/source/blender/src/drawmesh.c<br>
trunk/blender/source/blender/src/drawobject.c<br>
trunk/blender/source/blender/src/editkey.c<br>
trunk/blender/source/blender/src/editmesh_mods.c<br>
trunk/blender/source/blender/src/editmesh_tools.c<br>
trunk/blender/source/blender/src/header_info.c<br>
trunk/blender/source/blender/src/header_script.c<br>
trunk/blender/source/blender/src/interface.c<br>
trunk/blender/source/blender/src/meshlaplacian.c<br>
trunk/blender/source/blender/src/meshtools.c<br>
trunk/blender/source/blender/src/parametrizer.c<br>
trunk/blender/source/blender/src/parametrizer.h<br>
trunk/blender/source/blender/src/parametrizer_intern.h<br>
trunk/blender/source/blender/src/renderwin.c<br>
trunk/blender/source/blender/src/space.c<br>
trunk/blender/source/blender/src/toolbox.c<br>
trunk/blender/source/blender/src/transform_conversions.c<br>
trunk/blender/source/blender/yafray/intern/export_Plugin.cpp<br>
trunk/blender/source/gameengine/Ketsji/KX_MaterialIpoController.cpp<br>
trunk/blender/source/kernel/CMakeLists.txt<br>
trunk/blender/source/kernel/SConscript<br>
trunk/blender/source/kernel/gen_system/GEN_HashedPtr.cpp<br>
trunk/blender/source/kernel/gen_system/Makefile<br>
<br>
Added Paths:<br>
-----------<br>
trunk/blender/intern/guardedalloc/BLO_sys_types.h<br>
trunk/blender/intern/opennl/superlu/BLO_sys_types.h<br>
<br>
Added: trunk/blender/intern/guardedalloc/BLO_sys_types.h<br>
===================================================================<br>
--- trunk/blender/intern/guardedalloc/BLO_sys_types.h (rev 0)<br>
+++ trunk/blender/intern/guardedalloc/BLO_sys_types.h 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -0,0 +1,112 @@<br>
+/**<br>
+ * $Id$<br>
+ *<br>
+ * ***** BEGIN GPL LICENSE BLOCK *****<br>
+ *<br>
+ * This program is free software; you can redistribute it and/or<br>
+ * modify it under the terms of the GNU General Public License<br>
+ * as published by the Free Software Foundation; either version 2<br>
+ * of the License, or (at your option) any later version.<br>
+ *<br>
+ * This program is distributed in the hope that it will be useful,<br>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ * GNU General Public License for more details.<br>
+ *<br>
+ * You should have received a copy of the GNU General Public License<br>
+ * along with this program; if not, write to the Free Software Foundation,<br>
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.<br>
+ *<br>
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.<br>
+ * All rights reserved.<br>
+ *<br>
+ * The Original Code is: all of this file.<br>
+ *<br>
+ * Contributor(s): none yet.<br>
+ *<br>
+ * ***** END GPL LICENSE BLOCK *****<br>
+ * A platform-independent definition of [u]intXX_t<br>
+ * Plus the accompanying header include for htonl/ntohl<br>
+ *<br>
+ * This file includes <sys/types.h> to define [u]intXX_t types, where<br>
+ * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this<br>
+ * file.<br>
+ * - Windows uses __intXX compiler-builtin types. These are signed,<br>
+ * so we have to flip the signs.<br>
+ * For these rogue platforms, we make the typedefs ourselves.<br>
+ *<br>
+ */<br>
+<br>
+/*<br>
+// DG: original BLO_sys_types.h is in source/blender/blenkernel<br>
+// but is not allowed be accessed here because of bad-level-call<br>
+*/<br>
+<br>
+#ifndef BLO_SYS_TYPES_H<br>
+#define BLO_SYS_TYPES_H<br>
+<br>
+#ifdef __cplusplus<br>
+extern "C" {<br>
+#endif<br>
+<br>
+#ifdef FREE_WINDOWS<br>
+typedef unsigned char uint8_t;<br>
+typedef unsigned int uint32_t;<br>
+#endif<br>
+<br>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)<br>
+<br>
+/* The __intXX are built-in types of the visual complier! So we don't<br>
+ * need to include anything else here. */<br>
+<br>
+typedef signed __int8 int8_t;<br>
+typedef signed __int16 int16_t;<br>
+typedef signed __int32 int32_t;<br>
+typedef signed __int64 int64_t;<br>
+<br>
+typedef unsigned __int8 uint8_t;<br>
+typedef unsigned __int16 uint16_t;<br>
+typedef unsigned __int32 uint32_t;<br>
+typedef unsigned __int64 uint64_t;<br>
+<br>
+#ifdef _WIN64<br>
+typedef __int64 intptr_t;<br>
+typedef unsigned __int64 uintptr_t;<br>
+#else<br>
+typedef long intptr_t;<br>
+typedef unsigned long uintptr_t;<br>
+#endif<br>
+<br>
+#elif defined(__linux__)<br>
+<br>
+ /* Linux-i386, Linux-Alpha, Linux-ppc */<br>
+#include <stdint.h><br>
+<br>
+#elif defined (__APPLE__)<br>
+<br>
+#include <inttypes.h><br>
+<br>
+#else<br>
+<br>
+ /* FreeBSD, Irix, Solaris */<br>
+#include <sys/types.h><br>
+<br>
+#endif /* ifdef platform for types */<br>
+<br>
+#ifdef _WIN32<br>
+#define htonl(x) correctByteOrder(x)<br>
+#define ntohl(x) correctByteOrder(x)<br>
+#elif defined (__FreeBSD__) || defined (__OpenBSD__)<br>
+#include <sys/param.h><br>
+#elif defined (__APPLE__)<br>
+#include <sys/types.h><br>
+#else /* irix sun linux */<br>
+#include <netinet/in.h><br>
+#endif /* ifdef platform for htonl/ntohl */<br>
+<br>
+#ifdef __cplusplus<br>
+}<br>
+#endif<br>
+<br>
+#endif /* eof */<br>
+<br>
<br>
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c<br>
===================================================================<br>
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2008-08-17 16:36:37 UTC (rev 16146)<br>
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -49,6 +49,8 @@<br>
<br>
#include "MEM_guardedalloc.h"<br>
<br>
+#include "BLO_sys_types.h" // needed for intptr_t<br>
+<br>
/* --------------------------------------------------------------------- */<br>
/* Data definition */<br>
/* --------------------------------------------------------------------- */<br>
@@ -112,7 +114,7 @@<br>
<br>
<br>
volatile int totblock= 0;<br>
-volatile unsigned long mem_in_use= 0, mmap_in_use= 0;<br>
+volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;<br>
<br>
static volatile struct localListBase _membase;<br>
static volatile struct localListBase *membase = &_membase;<br>
@@ -335,7 +337,7 @@<br>
/* Memory statistics print */<br>
typedef struct MemPrintBlock {<br>
const char *name;<br>
- unsigned long len;<br>
+ uintptr_t len;<br>
int items;<br>
} MemPrintBlock;<br>
<br>
@@ -485,14 +487,14 @@<br>
return(-1);<br>
}<br>
<br>
- if(sizeof(long)==8) {<br>
- if (((long) memh) & 0x7) {<br>
+ if(sizeof(intptr_t)==8) {<br>
+ if (((intptr_t) memh) & 0x7) {<br>
MemorY_ErroR("free","attempt to free illegal pointer");<br>
return(-1);<br>
}<br>
}<br>
else {<br>
- if (((long) memh) & 0x3) {<br>
+ if (((intptr_t) memh) & 0x3) {<br>
MemorY_ErroR("free","attempt to free illegal pointer");<br>
return(-1);<br>
}<br>
<br>
Modified: trunk/blender/intern/guardedalloc/intern/mmap_win.c<br>
===================================================================<br>
--- trunk/blender/intern/guardedalloc/intern/mmap_win.c 2008-08-17 16:36:37 UTC (rev 16146)<br>
+++ trunk/blender/intern/guardedalloc/intern/mmap_win.c 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -151,7 +151,7 @@<br>
}<br>
<br>
/* munmap for windows */<br>
-long munmap(void *ptr, long size)<br>
+intptr_t munmap(void *ptr, intptr_t size)<br>
{<br>
MemMap *mm = mmap_findlink(mmapbase, ptr);<br>
if (!mm) {<br>
<br>
Modified: trunk/blender/intern/guardedalloc/mmap_win.h<br>
===================================================================<br>
--- trunk/blender/intern/guardedalloc/mmap_win.h 2008-08-17 16:36:37 UTC (rev 16146)<br>
+++ trunk/blender/intern/guardedalloc/mmap_win.h 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -45,8 +45,10 @@<br>
<br>
#define MAP_FAILED ((void *)-1)<br>
<br>
+#include "BLO_sys_types.h" // needed for intptr_t<br>
+<br>
void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);<br>
-long munmap(void *ptr, long size);<br>
+intptr_t munmap(void *ptr, intptr_t size);<br>
<br>
#endif<br>
<br>
<br>
Added: trunk/blender/intern/opennl/superlu/BLO_sys_types.h<br>
===================================================================<br>
--- trunk/blender/intern/opennl/superlu/BLO_sys_types.h (rev 0)<br>
+++ trunk/blender/intern/opennl/superlu/BLO_sys_types.h 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -0,0 +1,112 @@<br>
+/**<br>
+ * $Id$<br>
+ *<br>
+ * ***** BEGIN GPL LICENSE BLOCK *****<br>
+ *<br>
+ * This program is free software; you can redistribute it and/or<br>
+ * modify it under the terms of the GNU General Public License<br>
+ * as published by the Free Software Foundation; either version 2<br>
+ * of the License, or (at your option) any later version.<br>
+ *<br>
+ * This program is distributed in the hope that it will be useful,<br>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ * GNU General Public License for more details.<br>
+ *<br>
+ * You should have received a copy of the GNU General Public License<br>
+ * along with this program; if not, write to the Free Software Foundation,<br>
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.<br>
+ *<br>
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.<br>
+ * All rights reserved.<br>
+ *<br>
+ * The Original Code is: all of this file.<br>
+ *<br>
+ * Contributor(s): none yet.<br>
+ *<br>
+ * ***** END GPL LICENSE BLOCK *****<br>
+ * A platform-independent definition of [u]intXX_t<br>
+ * Plus the accompanying header include for htonl/ntohl<br>
+ *<br>
+ * This file includes <sys/types.h> to define [u]intXX_t types, where<br>
+ * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this<br>
+ * file.<br>
+ * - Windows uses __intXX compiler-builtin types. These are signed,<br>
+ * so we have to flip the signs.<br>
+ * For these rogue platforms, we make the typedefs ourselves.<br>
+ *<br>
+ */<br>
+<br>
+/*<br>
+// DG: original BLO_sys_types.h is in source/blender/blenkernel<br>
+// but is not allowed be accessed here because of bad-level-call<br>
+*/<br>
+<br>
+#ifndef BLO_SYS_TYPES_H<br>
+#define BLO_SYS_TYPES_H<br>
+<br>
+#ifdef __cplusplus<br>
+extern "C" {<br>
+#endif<br>
+<br>
+#ifdef FREE_WINDOWS<br>
+typedef unsigned char uint8_t;<br>
+typedef unsigned int uint32_t;<br>
+#endif<br>
+<br>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)<br>
+<br>
+/* The __intXX are built-in types of the visual complier! So we don't<br>
+ * need to include anything else here. */<br>
+<br>
+typedef signed __int8 int8_t;<br>
+typedef signed __int16 int16_t;<br>
+typedef signed __int32 int32_t;<br>
+typedef signed __int64 int64_t;<br>
+<br>
+typedef unsigned __int8 uint8_t;<br>
+typedef unsigned __int16 uint16_t;<br>
+typedef unsigned __int32 uint32_t;<br>
+typedef unsigned __int64 uint64_t;<br>
+<br>
+#ifdef _WIN64<br>
+typedef __int64 intptr_t;<br>
+typedef unsigned __int64 uintptr_t;<br>
+#else<br>
+typedef long intptr_t;<br>
+typedef unsigned long uintptr_t;<br>
+#endif<br>
+<br>
+#elif defined(__linux__)<br>
+<br>
+ /* Linux-i386, Linux-Alpha, Linux-ppc */<br>
+#include <stdint.h><br>
+<br>
+#elif defined (__APPLE__)<br>
+<br>
+#include <inttypes.h><br>
+<br>
+#else<br>
+<br>
+ /* FreeBSD, Irix, Solaris */<br>
+#include <sys/types.h><br>
+<br>
+#endif /* ifdef platform for types */<br>
+<br>
+#ifdef _WIN32<br>
+#define htonl(x) correctByteOrder(x)<br>
+#define ntohl(x) correctByteOrder(x)<br>
+#elif defined (__FreeBSD__) || defined (__OpenBSD__)<br>
+#include <sys/param.h><br>
+#elif defined (__APPLE__)<br>
+#include <sys/types.h><br>
+#else /* irix sun linux */<br>
+#include <netinet/in.h><br>
+#endif /* ifdef platform for htonl/ntohl */<br>
+<br>
+#ifdef __cplusplus<br>
+}<br>
+#endif<br>
+<br>
+#endif /* eof */<br>
+<br>
<br>
Modified: trunk/blender/intern/opennl/superlu/smemory.c<br>
===================================================================<br>
--- trunk/blender/intern/opennl/superlu/smemory.c 2008-08-17 16:36:37 UTC (rev 16146)<br>
+++ trunk/blender/intern/opennl/superlu/smemory.c 2008-08-17 17:08:00 UTC (rev 16147)<br>
@@ -8,6 +8,8 @@<br>
*/<br>
#include "ssp_defs.h"<br>
<br>
+#include "BLO_sys_types.h" // needed for intptr_t<br>
+<br>
/* Constants */<br>
#define NO_MEMTYPE 4 /* 0: lusup;<br>
1: ucol;<br>
@@ -49,8 +51,8 @@<br>
<br>
/* Macros to manipulate stack */<br>
#define StackFull(x) ( x + stack.used >= stack.size )<br>
-#define NotDoubleAlign(addr) ( (long int)addr & 7 )<br>
-#define DoubleAlign(addr) ( ((long int)addr + 7) & ~7L )<br>
+#define NotDoubleAlign(addr) ( (intptr_t)addr & 7 )<br>
+#define DoubleAlign(addr) ( ((intptr_t)addr + 7) & ~7L )<br>
#define TempSpace(m, w) ( (2*w + 4 + NO_MARKER) * m * sizeof(int) + \<br>
(w + 1) * m * sizeof(float) )<br>
#define Reduce(alpha) ((alpha + 1) / 2) /* i.e. (alpha-1)/2 + 1 */<br>
@@ -611,8 +613,8 @@<br>
<br>
last = (char*)usub + xusub[ndim] * iword;<br>
fragment = (char*) (((char*)stack.array + stack.top1) - last);<br>
- stack.used -= (long int) fragment;<br>
- stack.top1 -= (long int) fragment;<br>
+ stack.used -= (intptr_t) fragment;<br>
+ stack.top1 -= (intptr_t) fragment;<br>
<br>
Glu->ucol = ucol;<br>
<br>
@@ Diff output truncated at 10240 characters. @@<br>
<br>
_______________________________________________<br>
Bf-blender-cvs mailing list<br>
<a href="mailto:Bf-blender-cvs@blender.org">Bf-blender-cvs@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-blender-cvs" target="_blank">http://lists.blender.org/mailman/listinfo/bf-blender-cvs</a><br>
</blockquote></div><br></div>