[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19472] branches/blender2.5/blender/source :

[Daniel Genrich]

Revision: 19472
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19472
Author:   genscher
Date:     2009-03-30 20:21:17 +0200 (Mon, 30 Mar 2009)

Log Message:
-----------


Modified Paths:
--------------
    branches/blender2.5/blender/source/SConscript
    branches/blender2.5/blender/source/blender/makesdna/intern/dna_genfile.c

Modified: branches/blender2.5/blender/source/SConscript
===================================================================
--- branches/blender2.5/blender/source/SConscript	2009-03-30 17:31:37 UTC (rev 19471)
+++ branches/blender2.5/blender/source/SConscript	2009-03-30 18:21:17 UTC (rev 19472)
@@ -7,5 +7,5 @@
 if env['WITH_BF_GAMEENGINE']:
 	SConscript (['gameengine/SConscript'])
 	
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
+if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw'):
 	SConscript (['icons/SConscript'])

Modified: branches/blender2.5/blender/source/blender/makesdna/intern/dna_genfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/intern/dna_genfile.c	2009-03-30 17:31:37 UTC (rev 19471)
+++ branches/blender2.5/blender/source/blender/makesdna/intern/dna_genfile.c	2009-03-30 18:21:17 UTC (rev 19472)
@@ -298,7 +298,7 @@
 /* in sdna->data the data, now we convert that to something understandable */
 {
 	int *data, *verg;
-	long nr; /* intptr_t 2.48 XXX */
+	intptr_t nr;
 	short *sp;
 	char str[8], *cp;
 	
@@ -334,7 +334,7 @@
 			cp++;
 			nr++;
 		}
-		nr= (long)cp;		/* prevent BUS error */ /* intptr_t 2.48 XXX */
+		nr= (intptr_t)cp;		/* prevent BUS error */
 		nr= (nr+3) & ~3;
 		cp= (char *)nr;
 		
@@ -372,7 +372,7 @@
 			cp++;
 			nr++;
 		}
-		nr= (long)cp;		/* prevent BUS error */ /* intptr_t 2.48 XXX */
+		nr= (intptr_t)cp;		/* prevent BUS error */
 		nr= (nr+3) & ~3;
 		cp= (char *)nr;
 		
@@ -1081,6 +1081,6 @@
 	int SDNAnr= DNA_struct_find_nr(sdna, stype);
 	short *spo= sdna->structs[SDNAnr];
 	char *cp= find_elem(sdna, vartype, name, spo, NULL, NULL);
-	return (int)((long)cp); /* intptr_t 2.48 XXX */
+	return (int)((intptr_t)cp);
 }