From: Dan McGregor <dan.mcgregor@usask.ca>
To: git@vger.kernel.org
Cc: Dan McGregor <dan.mcgregor@usask.ca>
Subject: [PATCH v2] git-compat-util: undefine fileno if defined
Date: Fri, 8 Feb 2019 20:36:21 -0600 [thread overview]
Message-ID: <20190209023621.75255-1-dan.mcgregor@usask.ca> (raw)
In-Reply-To: <20190201193004.88736-1-dan.mcgregor@usask.ca>
Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR",
2019-01-10) introduced an implicit assumption that rewind, fileno, and
fflush are functions. At least on FreeBSD fileno is not, and as such
passing a void * failed.
All systems tested (FreeBSD and NetBSD) that define fineo as a macro
also have a function defined. Undefine the macro on these systems so
that the function is used.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
git-compat-util.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index 29a19902aa..b5489bbcf2 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -764,6 +764,15 @@ char *gitstrdup(const char *s);
extern FILE *git_fopen(const char*, const char*);
#endif
+/* Some systems (the various BSDs for eaxmple) define
+ * fileno as a macro as an optimization. All systems I
+ * know about also define it as a real funcion, so use
+ * the real function to allow passing void *s to fileno.
+ */
+#ifdef fileno
+# undef fileno
+#endif
+
#ifdef SNPRINTF_RETURNS_BOGUS
#ifdef snprintf
#undef snprintf
--
2.20.1
next prev parent reply other threads:[~2019-02-09 2:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 19:30 [PATCH] http: cast result to FILE * Dan McGregor
2019-02-01 21:17 ` Junio C Hamano
2019-02-02 11:21 ` Duy Nguyen
2019-02-04 11:44 ` Johannes Schindelin
2019-02-04 12:13 ` Duy Nguyen
2019-02-04 18:10 ` Junio C Hamano
2019-02-05 1:36 ` Dan McGregor
2019-02-09 2:36 ` Dan McGregor [this message]
2019-02-09 18:34 ` [PATCH v2] git-compat-util: undefine fileno if defined Junio C Hamano
2019-02-12 13:45 ` Duy Nguyen
2019-02-12 14:14 ` Duy Nguyen
2019-02-12 16:56 ` Junio C Hamano
2019-02-16 2:33 ` Dan McGregor
2019-05-08 7:46 ` Junio C Hamano
2019-05-08 10:09 ` Duy Nguyen
2019-05-08 10:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190209023621.75255-1-dan.mcgregor@usask.ca \
--to=dan.mcgregor@usask.ca \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).