diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:50:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:50:05 -0700 |
| commit | b11cf09043f18b368ec0d988f064ea21247c843d (patch) | |
| tree | 864a5086870ab9f5e48b3f6e2d5fa1264e9f074a /git-compat-util.h | |
| parent | ceff8e7adeed51024491deb4933f23db760e5641 (diff) | |
| parent | 003b33a8ad686ee4a0d0b36635bfd6aba940b24a (diff) | |
| download | git-b11cf09043f18b368ec0d988f064ea21247c843d.tar.gz | |
Merge branch 'da/pretty-tempname'
* da/pretty-tempname:
diff: generate pretty filenames in prep_temp_blob()
compat: add a basename() compatibility function
compat: add a mkstemps() compatibility function
Conflicts:
Makefile
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 4236647c91..f25f7f1a9e 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -99,6 +99,13 @@ #include "compat/mingw.h" #endif /* __MINGW32__ */ +#ifndef NO_LIBGEN_H +#include <libgen.h> +#else +#define basename gitbasename +extern char *gitbasename(char *); +#endif + #ifndef NO_ICONV #include <iconv.h> #endif @@ -234,6 +241,11 @@ extern int gitsetenv(const char *, const char *, int); extern char *gitmkdtemp(char *); #endif +#ifdef NO_MKSTEMPS +#define mkstemps gitmkstemps +extern int gitmkstemps(char *, int); +#endif + #ifdef NO_UNSETENV #define unsetenv gitunsetenv extern void gitunsetenv(const char *); |