diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-07 21:38:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-07 21:38:52 -0700 |
| commit | 24e519e0a5ee5d625c986c21d3f702528017b560 (patch) | |
| tree | a6c031649bc8cd1cc866daf81a822866a6128429 | |
| parent | 5ccdc5b375d870addd409a4b6ed8ba3144e11845 (diff) | |
| parent | caa4a614d192210a0f1f819499e71a8b6daacf0f (diff) | |
| download | srec-24e519e0a5ee5d625c986c21d3f702528017b560.tar.gz | |
am caa4a614: Merge "Xcode 4.3 compatibility checkin"
* commit 'caa4a614d192210a0f1f819499e71a8b6daacf0f':
Xcode 4.3 compatibility checkin
| -rw-r--r-- | portable/include/PortExport.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/portable/include/PortExport.h b/portable/include/PortExport.h index a5a3d7e..e795575 100644 --- a/portable/include/PortExport.h +++ b/portable/include/PortExport.h @@ -117,6 +117,18 @@ #endif /** + * inlining causes problems for the Xcode 4.3 and 4.4 command line tools, + * so this is needed to ensure the methods aren't inlined on those compilers + */ + +#if defined(__APPLE_CC__) +#if __APPLE_CC__ >= 5621 +#undef PINLINE +#define PINLINE +#endif +#endif + +/** * @} */ |