Merge branch 'dt/name-hash-dir-entry-fix' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index 076461e8c8d3cd2051e84060c2ca405c3a3577ac..f649e81f1107722f4c7d051201920ae2a0e7846a 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -717,10 +717,12 @@ extern void *xrealloc(void *ptr, size_t size);
 extern void *xcalloc(size_t nmemb, size_t size);
 extern void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
 extern void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
+extern int xopen(const char *path, int flags, ...);
 extern ssize_t xread(int fd, void *buf, size_t len);
 extern ssize_t xwrite(int fd, const void *buf, size_t len);
 extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
 extern int xdup(int fd);
+extern FILE *xfopen(const char *path, const char *mode);
 extern FILE *xfdopen(int fd, const char *mode);
 extern int xmkstemp(char *template);
 extern int xmkstemp_mode(char *template, int mode);