Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index 1930444ef092f2b5834d12b73b4d2d0c050f3551..9eab471264ab6a22af3e5eb4a0a97f510de19a7e 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -650,6 +650,10 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
 #define getpagesize() sysconf(_SC_PAGESIZE)
 #endif
 
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+
 #ifdef FREAD_READS_DIRECTORIES
 #ifdef fopen
 #undef fopen