diff options
| author | Manolo Gouy <Manolo> | 2016-09-13 10:56:19 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-09-13 10:56:19 +0000 |
| commit | cd7b6a8e873995f7f306b4b6045beb040e5c286c (patch) | |
| tree | 2572bd87a6840b253fd6bf14b825107356f1f477 /src | |
| parent | 2bb91d900c822bec757108627af04b82b619ff46 (diff) | |
Remove possible warnings when compiling with -Wundef
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11942 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm | 6 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 142a95984..5c0e7ba75 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -129,7 +129,7 @@ int Fl_Cocoa_Printer_Driver::start_job (int pagecount, int *frompage, int *topag else #endif { -#if !__LP64__ +#if !defined(__LP64__) || !__LP64__ Boolean accepted; status = PMCreateSession(&printSession); if (status != noErr) return 1; @@ -292,7 +292,7 @@ int Fl_Cocoa_Printer_Driver::start_page (void) else #endif { -#if ! __LP64__ +#if !defined(__LP64__) || !__LP64__ PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext = (PMSessionGetGraphicsContext_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionGetGraphicsContext"); status = PMSessionGetGraphicsContext(printSession, NULL, (void **)&gc); @@ -352,7 +352,7 @@ void Fl_Cocoa_Printer_Driver::end_job (void) fl_alert ("PM Session error %d", (int)status); } PMSessionEndDocumentNoDialog(printSession); -#if !__LP64__ +#if !defined(__LP64__) || !__LP64__ if (fl_mac_os_version < 100500) { PMRelease(printSettings); PMRelease(pageFormat); diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index 8b216d1ce..21bcf65df 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -47,7 +47,7 @@ static uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWid for (int i = h-1; i >= 0; i--) { uchar *from = baseAddress + i * mByteWidth; for (int j = 0; j < w; j++, from += 4) { -#if __ppc__ +#if defined(__ppc__) && __ppc__ memcpy(to, from + 1, 3); to += 3; #else diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 92948db3d..2d951cc8c 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -40,7 +40,7 @@ static CFMutableDictionaryRef attributes = NULL; static const int CoreText_threshold = 100500; // this represents Mac OS 10.5 // condition for the ATSU API to be available at compile time -#define HAS_ATSU (!__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 +#define HAS_ATSU (!defined(__LP64__) || !__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 // Bug: older versions calculated the value for *ap as a side effect of // making the name, and then forgot about it. To avoid having to change |