diff --git a/git-compat-util.h b/git-compat-util.h
index 0c98c9937df14bfa8be4f58cae84aa16029be883..5d543d29f85e432a89bb8cbfbe2d18205599b06f 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
#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
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
extern int gitsetenv(const char *, const char *, int);
#endif
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);
#ifdef NO_STRCASESTR
#define strcasestr gitstrcasestr
extern char *gitstrcasestr(const char *haystack, const char *needle);
static inline void *xmalloc(size_t size)
{
void *ret = malloc(size);
static inline void *xmalloc(size_t size)
{
void *ret = malloc(size);
+ if (!ret && !size)
+ ret = malloc(1);
if (!ret)
die("Out of memory, malloc failed");
return ret;
if (!ret)
die("Out of memory, malloc failed");
return ret;
static inline void *xrealloc(void *ptr, size_t size)
{
void *ret = realloc(ptr, size);
static inline void *xrealloc(void *ptr, size_t size)
{
void *ret = realloc(ptr, size);
+ if (!ret && !size)
+ ret = realloc(ptr, 1);
if (!ret)
die("Out of memory, realloc failed");
return ret;
if (!ret)
die("Out of memory, realloc failed");
return ret;
static inline void *xcalloc(size_t nmemb, size_t size)
{
void *ret = calloc(nmemb, size);
static inline void *xcalloc(size_t nmemb, size_t size)
{
void *ret = calloc(nmemb, size);
+ if (!ret && (!nmemb || !size))
+ ret = calloc(1, 1);
if (!ret)
die("Out of memory, calloc failed");
return ret;
if (!ret)
die("Out of memory, calloc failed");
return ret;