diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-07 18:38:09 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-07 18:38:09 -0700 |
commit | caa4a614d192210a0f1f819499e71a8b6daacf0f (patch) | |
tree | 127476a55b7d3a0f320a1b876b33107449e907e7 | |
parent | 84d13f373f031641743c4b08156529b8754a32a8 (diff) | |
parent | f09d1b6f7933065cd6102d968f108048c002a3aa (diff) | |
download | srec-caa4a614d192210a0f1f819499e71a8b6daacf0f.tar.gz |
Merge "Xcode 4.3 compatibility checkin"android-sdk-adt_r20tools_r20ics-plus-aosp
-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 + +/** * @} */ |