commit 3e60e44fae35febb9da905394698b21b45ad7301
author Jean-Baptiste Queru <jbq@google.com> Fri May 04 14:10:53 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Fri May 04 14:10:54 2012 -0700
tree b4c2a603559df54373cff00e46b01f4005b70f4c
parent d5f550bb2f556c5d287f7c8d2b77223654bcec37
parent 6c4b42c95a01f8d3c9e7697f6de956f3b58eb9d5

Merge "Xcode 4.3 compatibility checkin"

lib/ext2fs/ext2fs.h

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 234fbdd..d3119bb 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -30,6 +30,14 @@
 #endif
 
 /*
+ * The Apple compiler in Xcode 4.3 fails when inlines are enabled in
+ * so disable them for that compiler.
+ */
+#if __APPLE_CC__ >= 5621
+#define NO_INLINE_FUNCS
+#endif
+
+/*
  * Where the master copy of the superblock is located, and how big
  * superblocks are supposed to be.  We define SUPERBLOCK_SIZE because
  * the size of the superblock structure is not necessarily trustworthy