# macosx compat

This was SVN commit r4196.

source/lib/config.h

@@ -178,7 +178,7 @@
 # define OS_LINUX 0
 #endif
 // .. Mac OS X
-#if defined(__MACOSX__)
+#if (defined(__APPLE__) && defined(__MACH__))
 # define OS_MACOSX 1
 #else
 # define OS_MACOSX 0

source/lib/sysdep/sysdep.h

@@ -64,6 +64,19 @@
 #endif
 
 
+// try to define _W64, if not already done
+// (this is useful for catching pointer size bugs)
+#ifndef _W64
+# if MSC_VER
+#  define _W64 __w64
+# elif GCC_VER
+#  define _W64 __attribute__((mode (__pointer__)))
+# else
+#  define _W64
+# endif
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif

source/scripting/ScriptableComplex.inl

@@ -58,7 +58,7 @@ linker won't find the definitions of these functions. Right now this is only
 //-----------------------------------------------------------------------------
 
 
-template<typename T, bool ReadOnly = false> class CJSComplex;
+template<typename T, bool ReadOnly> class CJSComplex;
 
 template<typename T> class CJSComplexPropertyAccessor
 {