diff --git a/git-compat-util.h b/git-compat-util.h
index fe845ae639767dc8f56a9196a7faefb468737bba..81883e7270daadafb4d827e894fa4645ff2e2b66 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
#define PRIx32 "x"
#endif
+#ifndef PRIo32
+#define PRIo32 "o"
+#endif
+
#ifndef PATH_SEP
#define PATH_SEP ':'
#endif
extern uintmax_t gitstrtoumax(const char *, char **, int);
#endif
+#ifdef NO_STRTOK_R
+#define strtok_r gitstrtok_r
+extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
+#endif
+
#ifdef NO_HSTRERROR
#define hstrerror githstrerror
extern const char *githstrerror(int herror);