diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-22 22:19:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-22 22:19:18 +0400 |
| commit | e7d02e567990b8cac05565501e0b74a9bb195a6d (patch) | |
| tree | 3e96cef1967c7c07e421303a2ebe6c984fa2f2ee /source/blender/blenlib | |
| parent | bce3f7e019c174947a0f98063f39533eb59ab03e (diff) | |
2.5: warning fixes
Mostly harmless ones, except for one about "gzopen64" being
undeclared. This needs some defines in BLI_storage.h to be set
before <unistd.h> is included. Might fix a crash in compressed
file reading, though I'm not sure since it's hard to repeat
the crash consistently.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_storage.h | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/psfont.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_storage.h b/source/blender/blenlib/BLI_storage.h index d7bf3bd13f8..fa44bb36e15 100644 --- a/source/blender/blenlib/BLI_storage.h +++ b/source/blender/blenlib/BLI_storage.h @@ -25,15 +25,20 @@ * * ***** END GPL LICENSE BLOCK ***** */ + #ifndef BLI_STORAGE_H #define BLI_STORAGE_H +/* NOTE: these have to be defined before including unistd.h! */ #ifndef __APPLE__ #ifndef WIN32 -#define _LARGEFILE_SOURCE 1 +#ifndef _LARGEFILE_SOURCE +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE #define _FILE_OFFSET_BITS 64 #endif #endif +#endif struct direntry; diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c index 39d38e4cf3a..269e674a62f 100644 --- a/source/blender/blenlib/intern/psfont.c +++ b/source/blender/blenlib/intern/psfont.c @@ -837,7 +837,7 @@ static int decodetype1(PackedFile * pf, char *outname) while(newfgets(oneline, LINELEN, pf)) { hptr = (char *)oneline; while(*hptr) { - if(hextab[*hptr] != NOTHEX) + if(hextab[(int)*hptr] != NOTHEX) hexdat[hexbytes++] = *hptr; hptr++; } @@ -853,7 +853,7 @@ static int decodetype1(PackedFile * pf, char *outname) bptr = bindat; c = datbytes; while(c--) { - *bptr++ = (hextab[hptr[0]]<<4)+hextab[hptr[1]]; + *bptr++ = (hextab[(int)hptr[0]]<<4)+hextab[(int)hptr[1]]; hptr += 2; } |