X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=git-compat-util.h;h=000042d79352b4a7bb789d60e5324af92f29871a;hb=d8cf053dacb4f78920c112d10c7be21e4f5a5817;hp=5bd9ad7d2a23773b1410ded9f4f241ebe4d4da00;hpb=7cc51cfe5ebb4fc23221ebcb050b527b89ebc0bc;p=git.git

diff --git a/git-compat-util.h b/git-compat-util.h
index 5bd9ad7d2..000042d79 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -153,6 +153,15 @@
 #endif
 #endif
 
+/* used on Mac OS X */
+#ifdef PRECOMPOSE_UNICODE
+#include "compat/precompose_utf8.h"
+#else
+#define precompose_str(in,i_nfd2nfc)
+#define precompose_argv(c,v)
+#define probe_utf8_pathname_composition(a,b)
+#endif
+
 #ifndef NO_LIBGEN_H
 #include <libgen.h>
 #else
@@ -595,6 +604,12 @@ int rmdir_or_warn(const char *path);
  */
 int remove_or_warn(unsigned int mode, const char *path);
 
+/* Call access(2), but warn for any error besides ENOENT. */
+int access_or_warn(const char *path, int mode);
+
+/* Warn on an inaccessible file that ought to be accessible */
+void warn_on_inaccessible(const char *path);
+
 /* Get the passwd entry for the UID of the current process. */
 struct passwd *xgetpwuid_self(void);