X-Git-Url: http://git.scripts.mit.edu/?a=blobdiff_plain;f=git-compat-util.h;h=115cb1da42cc314f75a5b032d90798e5a2ce68c5;hb=00160242770aea137ec7154a8e8406feef733926;hp=ff193f4aa236727cc9b87ddbaeac1975b8c40fa7;hpb=afbfcaa98396de66e42dc3c845f396c5ba508ced;p=git.git

diff --git a/git-compat-util.h b/git-compat-util.h
index ff193f4aa2..115cb1da42 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -129,8 +129,6 @@
 #include <poll.h>
 #endif
 
-extern int get_st_mode_bits(const char *path, int *mode);
-
 #if defined(__MINGW32__)
 /* pull in Windows compatibility stuff */
 #include "compat/mingw.h"
@@ -171,7 +169,6 @@ typedef unsigned long uintptr_t;
 #undef _XOPEN_SOURCE
 #include <grp.h>
 #define _XOPEN_SOURCE 600
-#include "compat/cygwin.h"
 #else
 #undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
 #include <grp.h>
@@ -303,6 +300,13 @@ extern char *gitbasename(char *);
 #endif
 #endif
 
+/* The sentinel attribute is valid from gcc version 4.0 */
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define LAST_ARG_MUST_BE_NULL __attribute__((sentinel))
+#else
+#define LAST_ARG_MUST_BE_NULL
+#endif
+
 #include "compat/bswap.h"
 
 #ifdef USE_WILDMATCH