Make sure the empty tree exists when needed in merge-recursive.

diff --git a/convert-objects.c b/convert-objects.c
index 631678b08a7cb83b0349f1a683d3cd7fb797fb7a..881258311a47f9faa437ec02e99b4a0df1439d53 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500 /* glibc2 and AIX 5.3L need this */
+#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 */
 #define _GNU_SOURCE
 #include <time.h>