diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-04 18:09:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-04 18:09:23 -0700 |
| commit | a2e05ead45f57030aa86a82bbaf891f28f7d5a58 (patch) | |
| tree | de7c21fdcc01877ab4cb57b3d1dd9138dfd8af28 | |
| parent | dc3069ab9b1ccdf39058fe1729a5cd8533a93734 (diff) | |
| parent | 3e60e44fae35febb9da905394698b21b45ad7301 (diff) | |
| download | android_external_e2fsprogs-a2e05ead45f57030aa86a82bbaf891f28f7d5a58.tar.gz android_external_e2fsprogs-a2e05ead45f57030aa86a82bbaf891f28f7d5a58.tar.bz2 android_external_e2fsprogs-a2e05ead45f57030aa86a82bbaf891f28f7d5a58.zip | |
am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"
* commit '3e60e44fae35febb9da905394698b21b45ad7301':
Xcode 4.3 compatibility checkin
| -rw-r--r-- | lib/ext2fs/ext2fs.h | 8 |
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 |