summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-30 18:30:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-01 00:25:20 (GMT)
commite3a56298135ed4cce302e7da792793d3e5623c29 (patch)
tree4525a6f8b2357b3cc03e771fcbbe3023de600239 /upload-pack.c
parentfc046a75d539a78e6b2c16534c4078617a69a327 (diff)
downloadgit-e3a56298135ed4cce302e7da792793d3e5623c29.zip
git-e3a56298135ed4cce302e7da792793d3e5623c29.tar.gz
git-e3a56298135ed4cce302e7da792793d3e5623c29.tar.bz2
upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
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>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c6
1 files changed, 3 insertions, 3 deletions
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 "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>";