Author: post Date: 2013-11-04 08:36:31 +0100 (Mon, 04 Nov 2013) New Revision: 607
Modified: RawSpeed/StdAfx.h Log: Don't include malloc.h on OSX. Modified: RawSpeed/StdAfx.h =================================================================== --- RawSpeed/StdAfx.h 2013-10-28 20:09:25 UTC (rev 606) +++ RawSpeed/StdAfx.h 2013-11-04 07:36:31 UTC (rev 607) @@ -29,22 +29,31 @@ #endif #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +// there's no <malloc.h> on OS X +#if !defined(__APPLE__) #include <malloc.h> +#endif + #include <stdio.h> + #ifdef __MINGW32__ #include <stdlib.h> #endif + #if !defined(__unix__) && !defined(__APPLE__) #include <tchar.h> #include <io.h> #include <windows.h> + #ifndef __MINGW32__ #include <crtdbg.h> #else #include <stdexcept> #endif -#else // if unix +#else // !defined(__unix__) && !defined(__APPLE__) + #ifdef _XOPEN_SOURCE #if (_XOPEN_SOURCE < 600) #undef _XOPEN_SOURCE _______________________________________________ Rawstudio-commit mailing list [email protected] http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
