From 0e3233a205a0cff0df4eb5896a940ee752321d85 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 29 Mar 2007 05:39:16 +0000 Subject: [PATCH] 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. --- CHANGELOG.txt | 4 +++- CREDITS.txt | 3 ++- physfs.c | 6 +++--- platform/macosx.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b7752d1..6634df9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,7 +4,9 @@ 03282007 - Logic bug in MVL/HOG/GRP archivers: only enumerated files when 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 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. diff --git a/CREDITS.txt b/CREDITS.txt index 5b5e9f9..105631c 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -70,7 +70,8 @@ Spanish translation: Pedro J. Pérez MacOS Classic fixes, -MPW support: +MPW support, +bug fixes: Chris Taylor Mingw support, diff --git a/physfs.c b/physfs.c index a5e3470..8bc929f 100644 --- a/physfs.c +++ b/physfs.c @@ -1567,12 +1567,12 @@ void PHYSFS_enumerateFilesCallback(const char *_fname, size_t len; char *fname; - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, /*0*/); - BAIL_IF_MACRO(callback == NULL, ERR_INVALID_ARGUMENT, /*0*/); + BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, ) /*0*/; + BAIL_IF_MACRO(callback == NULL, ERR_INVALID_ARGUMENT, ) /*0*/; len = strlen(_fname) + 1; 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)) { diff --git a/platform/macosx.c b/platform/macosx.c index 93d6183..4dde270 100644 --- a/platform/macosx.c +++ b/platform/macosx.c @@ -170,7 +170,7 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) int i, mounts; 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! */ for (i = 0; i < mounts; i++)