Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2009-03-30 22:21:17 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2009-03-30 22:21:17 +0400
commitdbdb5893b2e46ce035ae6811a7fa7fb8811ae2d5 (patch)
treeab7cd12ef7910208db915503e29310e87021f822 /source/blender/makesdna
parentfe33fb23d9c4ba4951e8db080363777fd0db8949 (diff)
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/intern/dna_genfile.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 0ffc170a5aa..b4b029a19e5 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -298,7 +298,7 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap)
/* 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 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap)
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 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap)
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 DNA_elem_offset(SDNA *sdna, char *stype, char *vartype, char *name)
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);
}