diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2019-02-15 10:09:07 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-02-15 10:09:07 +0800 |
| commit | a603d9406e6b4e8087b44a1b3c988b5f007ea770 (patch) | |
| tree | 4f1929916d9500ec76596e0774df47b379b792d1 /git-compat-util.h | |
| parent | 94328ceff010fc6df89c062a1e3a2561e719cb53 (diff) | |
| parent | 2d08f3deb9feb73dc8d21d75bfd367839fc1322c (diff) | |
| download | git-a603d9406e6b4e8087b44a1b3c988b5f007ea770.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 29a19902aa..6573808ebd 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1234,6 +1234,14 @@ struct tm *git_gmtime_r(const time_t *, struct tm *); #define getc_unlocked(fh) getc(fh) #endif +#ifdef FILENO_IS_A_MACRO +int git_fileno(FILE *stream); +# ifndef COMPAT_CODE +# undef fileno +# define fileno(p) git_fileno(p) +# endif +#endif + /* * Our code often opens a path to an optional file, to work on its * contents when we can successfully open it. We can ignore a failure |