Merge all the Unix __PHYSFS_platformDetectAvailableCDs() funcs into one.
--- a/src/platform_unix.c Mon Apr 13 03:40:30 2009 -0400
+++ b/src/platform_unix.c Mon Apr 13 17:09:36 2009 -0400
@@ -55,17 +55,13 @@
} /* __PHYSFS_platformDeinit */
-#ifdef PHYSFS_NO_CDROM_SUPPORT
-
/* Stub version for platforms without CD-ROM support. */
void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
{
-} /* __PHYSFS_platformDetectAvailableCDs */
+#if (defined PHYSFS_NO_CDROM_SUPPORT)
+ /* no-op. */
#elif (defined PHYSFS_HAVE_SYS_UCRED_H)
-
-void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
-{
int i;
struct statfs *mntbufp = NULL;
int mounts = getmntinfo(&mntbufp, MNT_WAIT);
@@ -84,12 +80,8 @@
if (add_it)
cb(data, mntbufp[i].f_mntonname);
} /* for */
-} /* __PHYSFS_platformDetectAvailableCDs */
#elif (defined PHYSFS_HAVE_MNTENT_H)
-
-void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
-{
FILE *mounts = NULL;
struct mntent *ent = NULL;
@@ -109,11 +101,9 @@
} /* while */
endmntent(mounts);
-
+#endif
} /* __PHYSFS_platformDetectAvailableCDs */
-#endif
-
/* this is in posix.c ... */
extern char *__PHYSFS_platformCopyEnvironmentVariable(const char *varname);