path: root/git-compat-util.h
diff options
authorJunio C Hamano <>2010-08-31 23:23:38 (GMT)
committerJunio C Hamano <>2010-08-31 23:23:38 (GMT)
commitaca35505db3706c87d391dd213e856f73edfd42c (patch)
tree80b2d3878ae3ff21db1b1c21b9eaa6fefc290550 /git-compat-util.h
parentd7cc7c971f58091a2f2a15d2dca0fab0bd2ca310 (diff)
parentcd9a7b57a7118672441f9e9670a9fbb42249cf67 (diff)
Merge branch 'jn/svn-fe'
* jn/svn-fe: t/ add an +x bit to this test t9010 (svn-fe): avoid symlinks in test t9010 (svn-fe): use Unix-style path in URI vcs-svn: Avoid %z in format string vcs-svn: Rename dirent pool to build on Windows compat: add strtok_r() treap: style fix vcs-svn: remove build artifacts on "make clean" svn-fe manual: Clarify warning about deltas in dump files Update svn-fe manual SVN dump parser Infrastructure to write revisions in fast-export format Add stream helper library Add string-specific memory pool Add treap implementation Add memory pool library Introduce vcs-svn lib
Diffstat (limited to 'git-compat-util.h')
1 files changed, 5 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index fe845ae..877096e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -312,6 +312,11 @@ extern size_t gitstrlcpy(char *, const char *, size_t);
extern uintmax_t gitstrtoumax(const char *, char **, int);
+#ifdef NO_STRTOK_R
+#define strtok_r gitstrtok_r
+extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
#define hstrerror githstrerror
extern const char *githstrerror(int herror);