Use extended SHA1 syntax in merge-recursive conflicts.

[git.git] / git-compat-util.h

diff --git a/git-compat-util.h b/git-compat-util.h
index a55b923894196b5c4a5af32cd773b24824f14cec..f79365b362ab6f5fb8333e921d6b4d25c32884d5 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -11,7 +11,7 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
-#if !defined(__APPLE__) && !defined(__FreeBSD)
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
 #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
 #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
 #endif