From 5ea322679cdc60c147b53c66917143b3d5b4a559 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Fri, 28 Aug 2015 14:04:21 +0000 Subject: Moved Mac-specific type declaration to mac.H git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/mac.H | 3 +++ src/Fl_Gl_Device_Plugin.cxx | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FL/mac.H b/FL/mac.H index 616eaeffc..84728ecc6 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -94,6 +94,9 @@ class NSOpenGLContext; 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 typedef struct flCocoaRegion { int count; diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index a63a4dd50..e9b43d1cf 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -90,9 +90,6 @@ static Fl_RGB_Image* capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w } #ifdef __APPLE__ -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 -typedef CGImageAlphaInfo CGBitmapInfo; -#endif static void imgProviderReleaseData (void *info, const void *data, size_t size) { delete (Fl_RGB_Image *)info; -- cgit v1.2.3