t4150: tests for am --[no-]scissors

diff --git a/git-compat-util.h b/git-compat-util.h
index af5af226807ed2da5a2630d258aac14953811dd4..c6d391f86490b94e4df667d64d54323e1915c477 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -187,6 +187,7 @@
 #elif defined(_MSC_VER)
 #include "compat/msvc.h"
 #else
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
@@ -934,4 +935,10 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 # define SHELL_PATH "/bin/sh"
 #endif
 
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
+#define flockfile(fh)
+#define funlockfile(fh)
+#define getc_unlocked(fh) getc(fh)
+#endif
+
 #endif