summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Sutton <al@funkyandroid.com>2012-02-21 12:32:30 +0000
committerJean-Baptiste Queru <jbq@google.com>2012-05-03 18:40:38 -0700
commitf09d1b6f7933065cd6102d968f108048c002a3aa (patch)
tree404806b657050c8a08e394f14675e06856716ccb
parent38d0f27b33c60b9be4c636af74bcbbae0bfb28b0 (diff)
downloadsrec-f09d1b6f7933065cd6102d968f108048c002a3aa.tar.gz
Xcode 4.3 compatibility checkin
Xcode 4.3 is unable to find the inlined methods when linking libSR_Recognizer, so this patch clears the definition of PINLINE for the Xcode 4.3 compiler which ensures that the methods which cause the errors are not inlined Change-Id: I28d0bdf084cb60e93db80fe8a8c7ad6d0dd01dc0 Signed-off-by: Al Sutton <al@funkyandroid.com>
-rw-r--r--portable/include/PortExport.h12
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
+
+/**
* @}
*/