Ticket #49912: patch-fix_LP64.devel.diff

FL/mac.H

@@ -75 +75 @@
 #define MAC_OS_X_VERSION_10_11 101100
 #endif
 
-#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
-#if defined(__LP64__) && __LP64__
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
+#ifdef __OBJC__
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
+#include <objc/NSObjCRuntime.h>
 #else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
+#include <Foundation/NSObjCRuntime.h>
+#endif
+
+#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
+#error "NSINTEGER_DEFINED not defined"
 #endif
+
 #endif
 
 #ifdef __OBJC__
@@ -112 +115 @@
 struct XPoint { int x, y; };
 struct XRectangle {int x, y, width, height;};
 #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
-#if defined(__LP64__) && __LP64__
-typedef double CGFloat;
-#else
-typedef float CGFloat;
-#endif
+#error "CGFLOAT_DEFINED not defined"
 #endif // CGFLOAT_DEFINED
 
 extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);

src/Fl_Quartz_Printer.mm

@@ -89 +89 @@
   else
 #endif
   {
-#if !__LP64__
+#if !__LP64__ && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
     Boolean accepted;
     status = PMCreateSession(&printSession);
     if (status != noErr) return 1;