diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-04 18:12:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-04 18:12:26 -0700 |
| commit | ea1c3b57145c42c1f9e2a4cf9644ff0eb2c9514d (patch) | |
| tree | 3495028896cf4aa9f918e019e1ebd682b79750fb | |
| parent | ee85edaf74adfc962ff0281b24aa7aa65a4eff1b (diff) | |
| parent | a2e05ead45f57030aa86a82bbaf891f28f7d5a58 (diff) | |
| download | e2fsprogs-ea1c3b57145c42c1f9e2a4cf9644ff0eb2c9514d.tar.gz | |
am a2e05ead: am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"
* commit 'a2e05ead45f57030aa86a82bbaf891f28f7d5a58':
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 13a2261e..3573e854 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 |