aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source/flprefix.h
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2003-03-03 07:57:50 +0000
committerThomas Grill <xovo@users.sourceforge.net>2003-03-03 07:57:50 +0000
commitc3ae6e7ab08db709ffa1975eea70bfc9461f1d6a (patch)
tree04f0076fb51a1ed9ff22b16385e07a4105bb34c3 /externals/grill/flext/source/flprefix.h
parentfe9b0d819d5478fa8256a612f3ba7de44894baf5 (diff)
""
svn path=/trunk/; revision=448
Diffstat (limited to 'externals/grill/flext/source/flprefix.h')
-rwxr-xr-xexternals/grill/flext/source/flprefix.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h
index dce223e7..028c8df9 100755
--- a/externals/grill/flext/source/flprefix.h
+++ b/externals/grill/flext/source/flprefix.h
@@ -171,10 +171,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#endif
#ifndef FLEXT_OSAPI
- #if TARGET_API_MAC_CARBON
- #define FLEXT_OSAPI FLEXT_OSAPI_MAC_CARBON
- #elif TARGET_API_MAC_OSX
+ #if TARGET_API_MAC_OSX
+ // this has the precedence (OSX can also be Carbon, of course)
#define FLEXT_OSAPI FLEXT_OSAPI_MAC_OSX
+ #elif TARGET_API_MAC_CARBON
+ #define FLEXT_OSAPI FLEXT_OSAPI_MAC_CARBON
#else
#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
#endif