[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16172] branches/apricot/intern/ guardedalloc/intern/mallocn.c: small error, stopped apricot building on linux-32bit

Campbell Barton ideasman42 at gmail.com
Mon Aug 18 15:06:35 CEST 2008


Revision: 16172
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16172
Author:   campbellbarton
Date:     2008-08-18 15:06:33 +0200 (Mon, 18 Aug 2008)

Log Message:
-----------
small error, stopped apricot building on linux-32bit

Modified Paths:
--------------
    branches/apricot/intern/guardedalloc/intern/mallocn.c

Modified: branches/apricot/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/apricot/intern/guardedalloc/intern/mallocn.c	2008-08-18 12:40:31 UTC (rev 16171)
+++ branches/apricot/intern/guardedalloc/intern/mallocn.c	2008-08-18 13:06:33 UTC (rev 16172)
@@ -696,12 +696,12 @@
 	return(name);
 }
 
-unsigned long MEM_get_memory_in_use(void)
+uintptr_t MEM_get_memory_in_use(void)
 {
 	return mem_in_use;
 }
 
-unsigned long MEM_get_mapped_memory_in_use(void)
+uintptr_t MEM_get_mapped_memory_in_use(void)
 {
 	return mmap_in_use;
 }





More information about the Bf-blender-cvs mailing list