Ticket #49912: patch-fix_LP64.devel.diff

File patch-fix_LP64.devel.diff, 1.4 KB (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 9 years ago)
  • FL/mac.H

    old new  
    7575#define MAC_OS_X_VERSION_10_11 101100
    7676#endif
    7777
    78 #ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
    79 #if defined(__LP64__) && __LP64__
    80 typedef long NSInteger;
    81 typedef unsigned long NSUInteger;
     78#ifdef __OBJC__
     79#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
     80#include <objc/NSObjCRuntime.h>
    8281#else
    83 typedef int NSInteger;
    84 typedef unsigned int NSUInteger;
     82#include <Foundation/NSObjCRuntime.h>
     83#endif
     84
     85#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
     86#error "NSINTEGER_DEFINED not defined"
    8587#endif
     88
    8689#endif
    8790
    8891#ifdef __OBJC__
     
    112115struct XPoint { int x, y; };
    113116struct XRectangle {int x, y, width, height;};
    114117#ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
    115 #if defined(__LP64__) && __LP64__
    116 typedef double CGFloat;
    117 #else
    118 typedef float CGFloat;
    119 #endif
     118#error "CGFLOAT_DEFINED not defined"
    120119#endif // CGFLOAT_DEFINED
    121120
    122121extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);
  • src/Fl_Quartz_Printer.mm

    old new int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage) 
    8989  else
    9090#endif
    9191  {
    92 #if !__LP64__
     92#if !__LP64__ && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
    9393    Boolean accepted;
    9494    status = PMCreateSession(&printSession);
    9595    if (status != noErr) return 1;