aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Sutton <al@funkyandroid.com>2012-02-23 18:23:10 +0000
committerDavid Ferguson <ferguson.david@gmail.com>2012-05-25 10:00:44 -0400
commitcdb03710941880016681243c1923b98a49466124 (patch)
tree0ca1ff897a4f6ae375441f80d6f1d630e991e855
parent9881ee3a5875384c5464d79bd2c6c24173dabddf (diff)
downloadandroid_external_e2fsprogs-ics.tar.gz
android_external_e2fsprogs-ics.tar.bz2
android_external_e2fsprogs-ics.zip
Xcode 4.3 compatibility checkinics-releaseicscm-9.1.0
Compilation on Xcode 4.3 does not handle inlined functions well and so the compile fails. This patch ensures that inlines are not used on that compiler. Signed-off-by: Al Sutton <al@funkyandroid.com>
-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 26749414..d6eaa9f9 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