Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 15:46:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the HAS_ATSU preprocessor variable once more

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11883 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-08-22 16:14:39 +00:00
parent 707d7f0dda
commit 9c8c062d6b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+3 -3
View File
@@ -39,7 +39,7 @@ static CFMutableDictionaryRef attributes = NULL;
#endif #endif
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 when the ATSU API is 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 (!__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
@@ -158,7 +158,7 @@ if(fl_mac_os_version >= CoreText_threshold) {
} }
else { else {
#endif #endif
#if (!__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 #if HAS_ATSU
ItemCount oFontCount, oCountAgain; ItemCount oFontCount, oCountAgain;
ATSUFontID *oFontIDs; ATSUFontID *oFontIDs;
// How many fonts? // How many fonts?
@@ -193,7 +193,7 @@ else {
} }
free(oFontIDs); free(oFontIDs);
return (Fl_Font)fl_free_font; return (Fl_Font)fl_free_font;
#endif //__LP64__ #endif // HAS_ATSU
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
} }
#endif #endif