Author: manolo Date: 2012-08-14 02:23:22 -0700 (Tue, 14 Aug 2012) New Revision: 9665 Log: Mac OS X: don't use the HAVE_SCANDIR_POSIX preprocessor variable because it has an OS version-dependent value.
Modified: branches/branch-1.3/FL/mac.H branches/branch-1.3/src/filename_list.cxx Modified: branches/branch-1.3/FL/mac.H =================================================================== --- branches/branch-1.3/FL/mac.H 2012-08-13 21:23:05 UTC (rev 9664) +++ branches/branch-1.3/FL/mac.H 2012-08-14 09:23:22 UTC (rev 9665) @@ -156,15 +156,6 @@ #define MAC_OS_X_VERSION_10_8 1080 #endif -#if defined(FL_LIBRARY) || defined(FL_INTERNALS) -#ifdef HAVE_SCANDIR_POSIX -#undef HAVE_SCANDIR_POSIX -#endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 -#define HAVE_SCANDIR_POSIX 1 -#endif -#endif // FL_LIBRARY || FL_INTERNALS - typedef CGImageRef Fl_Bitmask; extern CGContextRef fl_gc; Modified: branches/branch-1.3/src/filename_list.cxx =================================================================== --- branches/branch-1.3/src/filename_list.cxx 2012-08-13 21:23:05 UTC (rev 9664) +++ branches/branch-1.3/src/filename_list.cxx 2012-08-14 09:23:22 UTC (rev 9665) @@ -97,7 +97,7 @@ #ifndef HAVE_SCANDIR // This version is when we define our own scandir int n = fl_scandir(dirloc, list, 0, sort); -#elif defined(HAVE_SCANDIR_POSIX) +#elif defined(HAVE_SCANDIR_POSIX) && !defined(__APPLE__) // POSIX (2008) defines the comparison function like this: int n = scandir(dirloc, list, 0, (int(*)(const dirent **, const dirent **))sort); #elif defined(__osf__) @@ -109,7 +109,7 @@ #elif defined(__sgi) int n = scandir(dirloc, list, 0, sort); #elif defined(__APPLE__) -# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 int n = scandir(dirloc, list, 0, (int(*)(const struct dirent**,const struct dirent**))sort); # else int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort); _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
