summaryrefslogtreecommitdiff
path: root/builtin-upload-archive.c
diff options
context:
space:
mode:
authorRandal L. Schwartz <merlyn@stonehenge.com>2006-09-24 00:20:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-24 07:00:47 (GMT)
commited1795fcc5f2aa3f105630429bcbed49c50053fa (patch)
tree39f1a12acecd9db7e4ba3a6e62221a760c6fa0fd /builtin-upload-archive.c
parenta2f3db2f5de2a3667b0e038aa65e3e097e642e7d (diff)
downloadgit-ed1795fcc5f2aa3f105630429bcbed49c50053fa.zip
git-ed1795fcc5f2aa3f105630429bcbed49c50053fa.tar.gz
git-ed1795fcc5f2aa3f105630429bcbed49c50053fa.tar.bz2
builtin-upload-archive.c broken on openbsd
Looks like ctype again. Gotta be careful with that on BSD releases: $ gmake prefix=/opt/git all GIT_VERSION = 1.4.2.GIT gcc -o builtin-upload-archive.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR builtin-upload-archive.c In file included from /usr/include/sys/poll.h:54, from builtin-upload-archive.c:11: /usr/include/ctype.h:68: error: syntax error before ']' token /usr/include/ctype.h:69: error: syntax error before ']' token ... /usr/include/sys/poll.h:53:1: unterminated #ifndef /usr/include/sys/poll.h:28:1: unterminated #ifndef gmake: *** [builtin-upload-archive.o] Error 1 This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-upload-archive.c')
-rw-r--r--builtin-upload-archive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index 0596865..45c92e1 100644
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -2,13 +2,13 @@
* Copyright (c) 2006 Franck Bui-Huu
*/
#include <time.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
#include "cache.h"
#include "builtin.h"
#include "archive.h"
#include "pkt-line.h"
#include "sideband.h"
-#include <sys/wait.h>
-#include <sys/poll.h>
static const char upload_archive_usage[] =
"git-upload-archive <repo>";