summaryrefslogtreecommitdiff
path: root/compat/fnmatch
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 16:25:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 16:25:47 (GMT)
commita02cf90144293f4d7885be7f1d10240576aa161b (patch)
treeecc837d01c6363656745b04aa00826cfc095474e /compat/fnmatch
parent5cfe4256d98af22a570c78c5e3048391a90f5f98 (diff)
downloadgit-a02cf90144293f4d7885be7f1d10240576aa161b.zip
git-a02cf90144293f4d7885be7f1d10240576aa161b.tar.gz
git-a02cf90144293f4d7885be7f1d10240576aa161b.tar.bz2
compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
Somebody tried to compile fnmatch.c compatibility file on Interix and got an error because no header included in the file on that platform defined NULL. It usually comes from stddef.h and indirectly from other headers like string.h, unistd.h, stdio.h, stdlib.h, etc., but with the way we compile this file from our Makefile, inclusion of the header files that are expected to define NULL in fnmatch.c do not happen because they are protected with "#ifdef STDC_HEADERS", etc. which we do not pass. As the least-impact workaround, give a fall-back definition when none of the headers define NULL. Noticed-by: Markus Duft <mduft@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/fnmatch')
-rw-r--r--compat/fnmatch/fnmatch.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c
index 14feac7..9473aed 100644
--- a/compat/fnmatch/fnmatch.c
+++ b/compat/fnmatch/fnmatch.c
@@ -127,6 +127,10 @@ extern char *getenv ();
extern int errno;
# endif
+# ifndef NULL
+# define NULL 0
+# endif
+
/* This function doesn't exist on most systems. */
# if !defined HAVE___STRCHRNUL && !defined _LIBC