Merge branch 'pw/rebase-edit-message-for-replayed-merge'

diff --git a/git-compat-util.h b/git-compat-util.h
index fd3460108b4f41637def60e8a7232bbaaf075f5c..cc0e7e97334ec90a355f9c8eb088c6810a91193c 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1237,12 +1237,22 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 
 #ifdef FILENO_IS_A_MACRO
 int git_fileno(FILE *stream);
-# ifndef COMPAT_CODE
+# ifndef COMPAT_CODE_FILENO
 #  undef fileno
 #  define fileno(p) git_fileno(p)
 # endif
 #endif
 
+#ifdef NEED_ACCESS_ROOT_HANDLER
+int git_access(const char *path, int mode);
+# ifndef COMPAT_CODE_ACCESS
+#  ifdef access
+#  undef access
+#  endif
+#  define access(path, mode) git_access(path, mode)
+# endif
+#endif
+
 /*
  * Our code often opens a path to an optional file, to work on its
  * contents when we can successfully open it.  We can ignore a failure