mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
fc046a75d5
commit
e3a5629813
|
@ -1,3 +1,6 @@
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/poll.h>
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
#include "refs.h"
|
#include "refs.h"
|
||||||
#include "pkt-line.h"
|
#include "pkt-line.h"
|
||||||
|
@ -5,9 +8,6 @@
|
||||||
#include "object.h"
|
#include "object.h"
|
||||||
#include "commit.h"
|
#include "commit.h"
|
||||||
#include "exec_cmd.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>";
|
static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue