mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove possible warnings when compiled with -Wundef

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11943 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-09-13 11:51:24 +00:00
parent 381dbf43f6
commit 0c457fb89d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl_Gl_Device_Plugin.cxx
View File

@ -31,7 +31,7 @@ uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWidth)
for (int i = 0; i < h; 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

6
src/Fl_Quartz_Printer.mm
View File

@ -89,7 +89,7 @@ int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage)
else
#endif
{
#if !__LP64__
#if !defined(__LP64__) || !__LP64__
Boolean accepted;
status = PMCreateSession(&printSession);
if (status != noErr) return 1;
@ -246,7 +246,7 @@ int Fl_System_Printer::start_page (void)
else
#endif
{
#if ! __LP64__
#if !defined(__LP64__) || !__LP64__
PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext =
(PMSessionGetGraphicsContext_type)Fl_X::get_carbon_function("PMSessionGetGraphicsContext");
status = PMSessionGetGraphicsContext(printSession, NULL, (void **)&fl_gc);
@ -304,7 +304,7 @@ void Fl_System_Printer::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);

2
src/fl_font_mac.cxx
View File

@ -31,7 +31,7 @@ static CFMutableDictionaryRef attributes = NULL;
const int Fl_X::CoreText_threshold = 100500; // this represents Mac OS 10.5
// condition when the ATSU API is 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
Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize Size) {
next = 0;

2
src/fl_set_fonts_mac.cxx
View File

@ -137,7 +137,7 @@ if(fl_mac_os_version >= Fl_X::CoreText_threshold) {
}
else {
#endif
#if (!__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
#if (!defined(__LP64__) || !__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
ItemCount oFontCount, oCountAgain;
ATSUFontID *oFontIDs;
// How many fonts?