Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 22:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove possible warnings when compiling with -Wundef

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11942 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-09-13 10:56:19 +00:00
parent 2bb91d900c
commit cd7b6a8e87
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+3 -3
View File
@@ -129,7 +129,7 @@ int Fl_Cocoa_Printer_Driver::start_job (int pagecount, int *frompage, int *topag
else else
#endif #endif
{ {
#if !__LP64__ #if !defined(__LP64__) || !__LP64__
Boolean accepted; Boolean accepted;
status = PMCreateSession(&printSession); status = PMCreateSession(&printSession);
if (status != noErr) return 1; if (status != noErr) return 1;
@@ -292,7 +292,7 @@ int Fl_Cocoa_Printer_Driver::start_page (void)
else else
#endif #endif
{ {
#if ! __LP64__ #if !defined(__LP64__) || !__LP64__
PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext = PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext =
(PMSessionGetGraphicsContext_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionGetGraphicsContext"); (PMSessionGetGraphicsContext_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionGetGraphicsContext");
status = PMSessionGetGraphicsContext(printSession, NULL, (void **)&gc); 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); fl_alert ("PM Session error %d", (int)status);
} }
PMSessionEndDocumentNoDialog(printSession); PMSessionEndDocumentNoDialog(printSession);
#if !__LP64__ #if !defined(__LP64__) || !__LP64__
if (fl_mac_os_version < 100500) { if (fl_mac_os_version < 100500) {
PMRelease(printSettings); PMRelease(printSettings);
PMRelease(pageFormat); PMRelease(pageFormat);
src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+1 -1
View File
@@ -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--) { for (int i = h-1; i >= 0; i--) {
uchar *from = baseAddress + i * mByteWidth; uchar *from = baseAddress + i * mByteWidth;
for (int j = 0; j < w; j++, from += 4) { for (int j = 0; j < w; j++, from += 4) {
#if __ppc__ #if defined(__ppc__) && __ppc__
memcpy(to, from + 1, 3); memcpy(to, from + 1, 3);
to += 3; to += 3;
#else #else
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+1 -1
View File
@@ -40,7 +40,7 @@ static CFMutableDictionaryRef attributes = NULL;
static const int CoreText_threshold = 100500; // this represents Mac OS 10.5 static const int CoreText_threshold = 100500; // this represents Mac OS 10.5
// condition for the ATSU API to be available at compile time // 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 // 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 // making the name, and then forgot about it. To avoid having to change