git-compat-util: work around fileno(fp) that is a macro
On various BSD's, fileno(fp) is implemented as a macro that directly accesses the fields in the FILE * object, which breaks a function that accepts a "void *fp" parameter and calls fileno(fp) and expect it to work. Work it around by adding a compile-time knob FILENO_IS_A_MACRO that inserts a real helper function in the middle of the callchain. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
0d0ac3826a
commit
18a4f6be6b
@ -1220,6 +1220,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
|
||||
|
||||
Reference in New Issue
Block a user