summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorDuy Nguyen <pclouds@gmail.com>2019-02-12 14:14:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-12 18:01:59 (GMT)
commit18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164 (patch)
tree8ba3c3bc28c1eae9f19ce47e7fca682ee0e4a895 /git-compat-util.h
parent0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff)
downloadgit-18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164.zip
git-18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164.tar.gz
git-18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164.tar.bz2
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>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 09b0102..7899f42 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -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