Skip to content

Commit 9eb098d

Browse files
authored
Merge pull request libgit2#4991 from libgit2/ethomson/inttypes
Remove public 'inttypes.h' header
2 parents 554b3b9 + 247e6d9 commit 9eb098d

File tree

3 files changed

+6
-313
lines changed

3 files changed

+6
-313
lines changed

include/git2/common.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
#endif
2222

2323
#if defined(_MSC_VER) && _MSC_VER < 1800
24-
GIT_BEGIN_DECL
25-
# include "inttypes.h"
26-
GIT_END_DECL
27-
/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/
24+
# include <stdint.h>
2825
#elif !defined(__CLANG_INTTYPES_H)
2926
# include <inttypes.h>
3027
#endif

include/git2/inttypes.h

Lines changed: 0 additions & 309 deletions
This file was deleted.

src/cc-compat.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
/* Define the printf format specifer to use for size_t output */
4949
#if defined(_MSC_VER) || defined(__MINGW32__)
5050

51+
/* Visual Studio 2012 and prior lack PRId64 entirely */
52+
# ifndef PRId64
53+
# define PRId64 "I64d"
54+
# endif
55+
5156
/* The first block is needed to avoid warnings on MingW amd64 */
5257
# if (SIZE_MAX == ULLONG_MAX)
5358
# define PRIuZ "I64u"

0 commit comments

Comments
 (0)