Index: trunk/i386/boot2/boot.c =================================================================== --- trunk/i386/boot2/boot.c (revision 2426) +++ trunk/i386/boot2/boot.c (revision 2427) @@ -209,7 +209,7 @@ finalizeBootStruct(); // Jump to kernel's entry point. There's no going back now. - if ((checkOSVersion("10.7")) || (checkOSVersion("10.8")) || (checkOSVersion("10.9"))) + if ( LION || MOUNTAIN_LION || MAVERICKS ) { // Notify modules that the kernel is about to be started @@ -254,12 +254,12 @@ verbose("Specified kernel cache file path = %s\n", cacheFile); } else { // Lion, Mountain Lion and Mavericks prelink kernel cache file - if ((checkOSVersion("10.7")) || (checkOSVersion("10.8")) || (checkOSVersion("10.9"))) + if ( LION || MOUNTAIN_LION || MAVERICKS ) { snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCachePathSnow); verbose("10.7, 10.8 & 10.9 kernel cache file path = %s\n", kernelCacheFile); } // Snow Leopard prelink kernel cache file - else if (checkOSVersion("10.6")) { + else if ( SNOW_LEOPARD ) { snprintf(kernelCacheFile, sizeof(kernelCacheFile), "kernelcache_%s", (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64"); Index: trunk/i386/boot2/boot.h =================================================================== --- trunk/i386/boot2/boot.h (revision 2426) +++ trunk/i386/boot2/boot.h (revision 2427) @@ -28,6 +28,16 @@ #define __BOOT2_BOOT_H #include "libsaio.h" + +// OS X Versions + +#define MAVERICKS checkOSVersion("10.9") // Mavericks +#define MOUNTAIN_LION checkOSVersion("10.8") // Mountain Lion +#define LION checkOSVersion("10.7") // Lion +#define SNOW_LEOPARD checkOSVersion("10.6") // Snow Leopard +#define LEOPARD checkOSVersion("10.5") // Leopard +#define TIGER checkOSVersion("10.4") // Tiger + /* * Paths used by chameleon */ Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 2426) +++ trunk/CHANGES (revision 2427) @@ -1,3 +1,4 @@ +- ErmaC : define macro for OS X Versions - Slice and Clover Team : Replace "NULL" terminated strings and fit Boot2 Sectors size - ErmaC : Update bootargs - crazybirdy : Fit length for "Loading Darwin"