summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJohannes Sixt <j.sixt@viscovery.net>2007-11-12 10:09:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-13 02:16:34 (GMT)
commit726c8ef5a5a129d8157d0043f60fe7195d2cdb77 (patch)
treec3873ba6e35fff1288596f070ef62c0b7380f8bd /git-compat-util.h
parent9e79f00f06a5500b30941e6925adda070504e6cf (diff)
downloadgit-726c8ef5a5a129d8157d0043f60fe7195d2cdb77.zip
git-726c8ef5a5a129d8157d0043f60fe7195d2cdb77.tar.gz
git-726c8ef5a5a129d8157d0043f60fe7195d2cdb77.tar.bz2
Fix preprocessor logic that determines the availablity of strchrnul().
Apart from the error in the condition (&& should actually be ||), the construct #if !defined(A) || !A leads to a syntax error in the C preprocessor if A is indeed not defined. Tested-by: David Symonds <dsymonds@gmail.com> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 92d7967..ede9408 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -183,7 +183,13 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen);
#endif
-#if !defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 1)
+#ifdef __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2, 1)
+#define HAVE_STRCHRNUL
+#endif
+#endif
+
+#ifndef HAVE_STRCHRNUL
#define strchrnul gitstrchrnul
static inline char *gitstrchrnul(const char *s, int c)
{