[Vm-dev] [commit][3526] Fixes for 64-bit compilation on the Mac OS X 10.9/10.10 SDK

commits at squeakvm.org commits at squeakvm.org
Mon Dec 14 02:00:07 UTC 2015


Revision: 3526
Author:   eliot
Date:     2015-12-13 18:00:05 -0800 (Sun, 13 Dec 2015)
Log Message:
-----------
Fixes for 64-bit compilation on the Mac OS X 10.9/10.10 SDK

Modified Paths:
--------------
    trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h
    trunk/platforms/Cross/plugins/FloatMathPlugin/FloatMathPlugin.h

Property Changed:
----------------
    trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h

Modified: trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h
===================================================================
--- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h	2015-12-14 01:36:08 UTC (rev 3525)
+++ trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h	2015-12-14 02:00:05 UTC (rev 3526)
@@ -2,10 +2,10 @@
 #ifdef WIN32
 # include <windows.h>
 #endif
-#if defined(TARGET_API_MAC_CARBON)
-#include <OpenGL/gl.h>
+#if defined(BUILD_FOR_OSX) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) || defined(TARGET_API_MAC_CARBON)
+# include <OpenGL/gl.h>
 #else
-#include <GL/gl.h>
+# include <GL/gl.h>
 #endif
 
 /* Vertex buffer flags */

Modified: trunk/platforms/Cross/plugins/FloatMathPlugin/FloatMathPlugin.h
===================================================================
--- trunk/platforms/Cross/plugins/FloatMathPlugin/FloatMathPlugin.h	2015-12-14 01:36:08 UTC (rev 3525)
+++ trunk/platforms/Cross/plugins/FloatMathPlugin/FloatMathPlugin.h	2015-12-14 02:00:05 UTC (rev 3526)
@@ -3,7 +3,7 @@
 
 /* #define NO_ISNAN -- do NOT define this by default but in command line*/
 
-#ifndef NO_ISNAN
+#if !defined(NO_ISNAN) && !defined(isnan)
 /* by default we use fdlibm's isnan() */
 extern int isnan(double);
 #endif


Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Tue Oct  6 11:12:47 PDT 2015
   + Sun Dec 13 17:59:36 PST 2015



More information about the Vm-dev mailing list