diff options
| author | Vicent Marti <tanoku@gmail.com> | 2011-10-04 23:11:51 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-10-06 00:21:16 +0400 |
| commit | c060854ed5b42b76eda40e290851a315dbbaea04 (patch) | |
| tree | 18361559cf0cbcbc915273284277e6b00f7d9a46 /src/cc-compat.h | |
| parent | 72d6a20be073c2854cca220c851c977171a5a465 (diff) | |
msvc: Properly handle inttypes.h/stdint.h
Diffstat (limited to 'src/cc-compat.h')
| -rw-r--r-- | src/cc-compat.h | 55 |
1 files changed, 23 insertions, 32 deletions
diff --git a/src/cc-compat.h b/src/cc-compat.h index cce4ca9b1..c243f1d20 100644 --- a/src/cc-compat.h +++ b/src/cc-compat.h @@ -11,36 +11,36 @@ * See if our compiler is known to support flexible array members. */ #ifndef GIT_FLEX_ARRAY -# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -# define GIT_FLEX_ARRAY /* empty */ -# elif defined(__GNUC__) -# if (__GNUC__ >= 3) -# define GIT_FLEX_ARRAY /* empty */ -# else -# define GIT_FLEX_ARRAY 0 /* older GNU extension */ +# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +# define GIT_FLEX_ARRAY /* empty */ +# elif defined(__GNUC__) +# if (__GNUC__ >= 3) +# define GIT_FLEX_ARRAY /* empty */ +# else +# define GIT_FLEX_ARRAY 0 /* older GNU extension */ +# endif # endif -# endif /* Default to safer but a bit wasteful traditional style */ -# ifndef GIT_FLEX_ARRAY -# define GIT_FLEX_ARRAY 1 -# endif +# ifndef GIT_FLEX_ARRAY +# define GIT_FLEX_ARRAY 1 +# endif #endif #ifdef __GNUC__ -# define GIT_TYPEOF(x) (__typeof__(x)) +# define GIT_TYPEOF(x) (__typeof__(x)) #else -# define GIT_TYPEOF(x) +# define GIT_TYPEOF(x) #endif #ifdef __cplusplus -# define GIT_UNUSED(x) +# define GIT_UNUSED(x) #else -# ifdef __GNUC__ -# define GIT_UNUSED(x) x __attribute__ ((__unused__)) -# else -# define GIT_UNUSED(x) x -# endif +# ifdef __GNUC__ +# define GIT_UNUSED(x) x __attribute__ ((__unused__)) +# else +# define GIT_UNUSED(x) x +# endif #endif #if defined(_MSC_VER) @@ -49,28 +49,19 @@ #define GIT_UNUSED_ARG(x) #endif -/* - * Does our compiler/platform support the C99 <inttypes.h> and - * <stdint.h> header files. (C99 requires that <inttypes.h> - * includes <stdint.h>). - */ -#if !defined(_MSC_VER) -# define GIT_HAVE_INTTYPES_H 1 -#endif - /* Define the printf format specifer to use for size_t output */ #if defined(_MSC_VER) || defined(__MINGW32__) -# define PRIuZ "Iu" +# define PRIuZ "Iu" #else -# define PRIuZ "zu" +# define PRIuZ "zu" #endif /* Micosoft Visual C/C++ */ #if defined(_MSC_VER) /* disable "deprecated function" warnings */ -# pragma warning ( disable : 4996 ) +# pragma warning ( disable : 4996 ) /* disable "conditional expression is constant" level 4 warnings */ -# pragma warning ( disable : 4127 ) +# pragma warning ( disable : 4127 ) #endif #endif /* INCLUDE_compat_h__ */ |