summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlosmn@github.com>2016-03-11 16:31:32 +0100
committerCarlos Martín Nieto <carlosmn@github.com>2016-03-11 16:31:32 +0100
commit1ddada422caf8e72ba97dca2568d2bf879fed5f2 (patch)
treeeb945c81df5e89137e686619a9a5987adae2c5c2
parent2ba9a0ddacd315dafb54990ff2bfa204e6924016 (diff)
parent0ac4a5ded41f274471bf0bc77bd07e43c9406ff3 (diff)
downloadlibgit2-1ddada422caf8e72ba97dca2568d2bf879fed5f2.tar.gz
Merge pull request #3636 from nerdishbynature/fix-non-modular-header-in-module
Don't include inttypes if compiling for Mac/iOS
-rw-r--r--include/git2/common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/common.h b/include/git2/common.h
index 4f43185f8..c1efee320 100644
--- a/include/git2/common.h
+++ b/include/git2/common.h
@@ -24,7 +24,8 @@
GIT_BEGIN_DECL
# include "inttypes.h"
GIT_END_DECL
-#else
+/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/
+#elif !defined(__CLANG_INTTYPES_H)
# include <inttypes.h>
#endif