diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H index 912aacda6..aa2af3ed9 100644 --- a/FL/Fl_Copy_Surface.H +++ b/FL/Fl_Copy_Surface.H @@ -54,7 +54,7 @@ private: int height; Fl_Paged_Device *helper; #ifdef __APPLE__ - Fl_CFMutableDataRef pdfdata; + CFMutableDataRef pdfdata; CGContextRef oldgc; CGContextRef gc; void prepare_copy_pdf_and_tiff(int w, int h); diff --git a/FL/mac.H b/FL/mac.H index d7ad7fb00..bed13b4c7 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -41,7 +41,7 @@ typedef struct OpaquePMPrintSettings* PMPrintSettings; typedef struct OpaquePMPageFormat* PMPageFormat; typedef struct OpaquePMPrintSession* PMPrintSession; typedef struct CGImage* CGImageRef; -typedef void *Fl_CFMutableDataRef; // used in Fl_Copy_Surface.H +typedef struct __CFData* CFMutableDataRef; // used in Fl_Copy_Surface.H typedef CGContextRef Fl_Offscreen; #else // this part must be compiled when building the FLTK libraries @@ -96,7 +96,6 @@ class NSOpenGLContext; #endif // __OBJC__ typedef CGContextRef Fl_Offscreen; -typedef CFMutableDataRef Fl_CFMutableDataRef; #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 typedef CGImageAlphaInfo CGBitmapInfo; #endif