diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-14 05:18:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 05:18:41 +0300 |
| commit | 1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b (patch) | |
| tree | 2594969e363819ef50ad96ad999f352f35ea2a91 /git-compat-util.h | |
| parent | c73472a8deb9dc194d05747dda3061c6324750e4 (diff) | |
| parent | 18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164 (diff) | |
Merge branch 'nd/fileno-may-be-macro'
* nd/fileno-may-be-macro:
git-compat-util: work around fileno(fp) that is a macro
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 |