Merge pull request #444 from carlosmn/fetch-fixes

[libgit2.git] / src / cc-compat.h

diff --git a/src/cc-compat.h b/src/cc-compat.h
index aefe66d192771201e369fde830530f4475beec30..c243f1d20547957927422b2b135f46229ba32861 100644 (file)
--- a/src/cc-compat.h
+++ b/src/cc-compat.h
@@ -1,5 +1,8 @@
 /*
- * cc-compat.h - C compiler compat macros for internal use
+ * Copyright (C) 2009-2011 the libgit2 contributors
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
  */
 #ifndef INCLUDE_compat_h__
 #define INCLUDE_compat_h__
@@ -8,58 +11,57 @@
  * 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 */
-#  endif
-# endif
+#      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
 
 /* 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
 
-/*
- * 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
+#if defined(_MSC_VER)
+#define GIT_UNUSED_ARG(x) ((void)(x)); /* note trailing ; */
+#else
+#define GIT_UNUSED_ARG(x)
 #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 )
 #endif
 
 #endif /* INCLUDE_compat_h__ */