From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Cc: merlyn@stonehenge.com (Randal L. Schwartz)
Subject: [PATCH/RFT] upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
Date: Fri, 30 Jun 2006 11:30:29 -0700 [thread overview]
Message-ID: <7vr716h4xm.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vk66yilxd.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Fri, 30 Jun 2006 10:38:06 -0700")
Merlyn reports that <sys/poll.h> on OpenBSD 3.8 includes <ctype.h>
and having our custom ctype (done in git-compat-util.h which is
included via cache.h) makes upload-pack.c uncompilable. Try to
work it around by including the system headers first.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Can somebody with OpenBSD who can reproduce the original
problem confirm or reject this patch, so that the issue can
be resolved before 1.4.1, please?
diff --git a/upload-pack.c b/upload-pack.c
index 2b70c3d..b18eb9b 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1,3 +1,6 @@
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
#include "cache.h"
#include "refs.h"
#include "pkt-line.h"
@@ -5,9 +8,6 @@ #include "tag.h"
#include "object.h"
#include "commit.h"
#include "exec_cmd.h"
-#include <signal.h>
-#include <sys/poll.h>
-#include <sys/wait.h>
static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
next prev parent reply other threads:[~2006-06-30 18:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-30 16:57 fc046a75d539a78e6b2c16534c4078617a69a327 fails on OpenBSD 3.8 Randal L. Schwartz
2006-06-30 17:06 ` Junio C Hamano
2006-06-30 17:09 ` Randal L. Schwartz
2006-06-30 17:38 ` Junio C Hamano
2006-06-30 18:30 ` Junio C Hamano [this message]
2006-06-30 19:00 ` [PATCH/RFT] upload-pack.c: <sys/poll.h> includes <ctype.h> " Jakub Narebski
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr716h4xm.fsf_-_@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=merlyn@stonehenge.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox