aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-04 14:10:53 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-04 14:10:54 -0700
commit3e60e44fae35febb9da905394698b21b45ad7301 (patch)
treeb4c2a603559df54373cff00e46b01f4005b70f4c
parentd5f550bb2f556c5d287f7c8d2b77223654bcec37 (diff)
parent6c4b42c95a01f8d3c9e7697f6de956f3b58eb9d5 (diff)
downloadandroid_external_e2fsprogs-3e60e44fae35febb9da905394698b21b45ad7301.tar.gz
android_external_e2fsprogs-3e60e44fae35febb9da905394698b21b45ad7301.tar.bz2
android_external_e2fsprogs-3e60e44fae35febb9da905394698b21b45ad7301.zip
Merge "Xcode 4.3 compatibility checkin"
-rw-r--r--lib/ext2fs/ext2fs.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 234fbdd2..d3119bbd 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -30,6 +30,14 @@ extern "C" {
#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