walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't put comments in BAIL_* macros where we want an empty argument... 

apparently it aggravates some compilers. Thanks to Chris Taylor for this one.
This commit is contained in:
Ryan C. Gordon 2007-03-29 05:39:16 +00:00
parent 1e6550292d
commit 0e3233a205
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.txt
View File

@ -4,7 +4,9 @@
03282007 - Logic bug in MVL/HOG/GRP archivers: only enumerated files when 03282007 - Logic bug in MVL/HOG/GRP archivers: only enumerated files when
looking in a directory other than the root, instead of enumerating looking in a directory other than the root, instead of enumerating
only for the root (thanks, Chris!). only for the root (thanks, Chris!). Minor fix for compilers that
don't like the BAIL_* macros with an empty argument
(thanks, Chris!)
03262007 - Tons of Unicode work in windows.c ... should now use UCS-2 on 03262007 - Tons of Unicode work in windows.c ... should now use UCS-2 on
NT/XP/Vista/etc versions of the OS, and fallback to "ANSI" versions NT/XP/Vista/etc versions of the OS, and fallback to "ANSI" versions
for 95/98/ME, tapdancing around the system codepage if it has to. for 95/98/ME, tapdancing around the system codepage if it has to.

3
CREDITS.txt
View File

@ -70,7 +70,8 @@ Spanish translation:
Pedro J. Pérez Pedro J. Pérez
MacOS Classic fixes, MacOS Classic fixes,
MPW support: MPW support,
bug fixes:
Chris Taylor Chris Taylor
Mingw support, Mingw support,

6
physfs.c
View File

@ -1567,12 +1567,12 @@ void PHYSFS_enumerateFilesCallback(const char *_fname,
size_t len; size_t len;
char *fname; char *fname;
BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, /*0*/); BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, ) /*0*/;
BAIL_IF_MACRO(callback == NULL, ERR_INVALID_ARGUMENT, /*0*/); BAIL_IF_MACRO(callback == NULL, ERR_INVALID_ARGUMENT, ) /*0*/;
len = strlen(_fname) + 1; len = strlen(_fname) + 1;
fname = (char *) __PHYSFS_smallAlloc(len); fname = (char *) __PHYSFS_smallAlloc(len);
BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, /*0*/); BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, ) /*0*/;
if (sanitizePlatformIndependentPath(_fname, fname)) if (sanitizePlatformIndependentPath(_fname, fname))
{ {

2
platform/macosx.c
View File

@ -170,7 +170,7 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
int i, mounts; int i, mounts;
if (IOMasterPort(MACH_PORT_NULL, &masterPort) != KERN_SUCCESS) if (IOMasterPort(MACH_PORT_NULL, &masterPort) != KERN_SUCCESS)
BAIL_MACRO(ERR_OS_ERROR, /*return void*/); BAIL_MACRO(ERR_OS_ERROR, ) /*return void*/;
mounts = getmntinfo(&mntbufp, MNT_WAIT); /* NOT THREAD SAFE! */ mounts = getmntinfo(&mntbufp, MNT_WAIT); /* NOT THREAD SAFE! */
for (i = 0; i < mounts; i++) for (i = 0; i < mounts; i++)