X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-compat-util.h;h=f982b8e48469a5f09698808d1e55ded04d5923b8;hb=810255fd12536d296597a0366f514bf65c2e10f6;hp=c353b276f0464714a4c0220b20df6318a374e28e;hpb=4e7a2eccc21c9029180585e43b3b941d0bdf8b3b;p=git.git

diff --git a/git-compat-util.h b/git-compat-util.h
index c353b276..f982b8e4 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1,6 +1,14 @@
 #ifndef GIT_COMPAT_UTIL_H
 #define GIT_COMPAT_UTIL_H
 
+#ifndef FLEX_ARRAY
+#if defined(__GNUC__) && (__GNUC__ < 3)
+#define FLEX_ARRAY 0
+#else
+#define FLEX_ARRAY /* empty */
+#endif
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -55,6 +63,11 @@ extern int gitfakemunmap(void *start, size_t length);
 extern int gitsetenv(const char *, const char *, int);
 #endif
 
+#ifdef NO_UNSETENV
+#define unsetenv gitunsetenv
+extern void gitunsetenv(const char *);
+#endif
+
 #ifdef NO_STRCASESTR
 #define strcasestr gitstrcasestr
 extern char *gitstrcasestr(const char *haystack, const char *needle);