summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2015-11-18 15:53:46 +0000
committerManolo Gouy <Manolo>2015-11-18 15:53:46 +0000
commit0d2517331c85fd45bcd4ef6fd009cde7777436ee (patch)
tree7ad01c62ad036b73259614d0ded1d2c3a12504bb /FL
parent364dfaf8022321dd1237149b774e2d3fc5bf3f41 (diff)
Mac OS only: simpler definition of the pdfdata private member of the Fl_Copy_Surface class.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10915 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Copy_Surface.H2
-rw-r--r--FL/mac.H3
2 files changed, 2 insertions, 3 deletions
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