diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-24 07:03:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-24 07:03:42 +0400 |
commit | eb3beca8d4a1c5073992d3f8a30d4e87e4f29430 (patch) | |
tree | 8275091de7d0d5e509c2df5e5716440043b40e42 /source/blender/makesdna/intern | |
parent | 33bd38ebc74f42694f063fd7937d7b457a141727 (diff) |
replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 6 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
2 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 d493083db8b..5b115a404ce 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -667,7 +667,7 @@ static eSDNA_Type sdna_type_nr(const char *dna_type) else if( strcmp(dna_type, "float")==0) return SDNA_TYPE_FLOAT; else if( strcmp(dna_type, "double")==0) return SDNA_TYPE_DOUBLE; else if( strcmp(dna_type, "int64_t")==0) return SDNA_TYPE_INT64; - else if( strcmp(dna_type, "u_int64_t")==0) return SDNA_TYPE_UINT64; + else if( strcmp(dna_type, "uint64_t")==0) return SDNA_TYPE_UINT64; else return -1; /* invalid! */ } @@ -713,7 +713,7 @@ static void cast_elem(const char *ctype, const char *otype, const char *name, ch case SDNA_TYPE_INT64: val= *( (int64_t *)olddata); break; case SDNA_TYPE_UINT64: - val= *( (u_int64_t *)olddata); break; + val= *( (uint64_t *)olddata); break; } switch(ctypenr) { @@ -740,7 +740,7 @@ static void cast_elem(const char *ctype, const char *otype, const char *name, ch case SDNA_TYPE_INT64: *( (int64_t *)curdata)= val; break; case SDNA_TYPE_UINT64: - *( (u_int64_t *)curdata)= val; break; + *( (uint64_t *)curdata)= val; break; } olddata+= oldlen; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 31f52866367..2fa52776453 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -939,7 +939,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) add_type("float", 4); /* SDNA_TYPE_FLOAT */ add_type("double", 8); /* SDNA_TYPE_DOUBLE */ add_type("int64_t", 8); /* SDNA_TYPE_INT64 */ - add_type("u_int64_t", 8); /* SDNA_TYPE_UINT64 */ + add_type("uint64_t", 8); /* SDNA_TYPE_UINT64 */ add_type("void", 0); /* SDNA_TYPE_VOID */ // the defines above shouldn't be output in the padding file... |