builtin-upload-archive.c broken on openbsd

builtin-upload-archive.c broken on openbsd

[Randal L. Schwartz]

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/ctype.h:71: error: syntax error before ']' token
    /usr/include/ctype.h:76: error: syntax error before ']' token
    /usr/include/ctype.h:79: error: syntax error before '(' token
    /usr/include/ctype.h:80: error: syntax error before '(' token
    /usr/include/ctype.h:98: error: syntax error before "c"
    In file included from /usr/include/sys/poll.h:54,
                     from builtin-upload-archive.c:11:
    /usr/include/ctype.h:96:1: unterminated #if  
    /usr/include/ctype.h:40:1: unterminated #ifndef
    In file included from builtin-upload-archive.c:11:
    /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:

>From 5a7951c5294fc05e2754a1b6f503e36cd7b2a2f0 Mon Sep 17 00:00:00 2001
From: Charlie <root@blue.stonehenge.com>
Date: Sat, 23 Sep 2006 17:19:53 -0700
Subject: [PATCH] local patch for openbsd

---
 builtin-upload-archive.c |    4 ++--
 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>";
--
1.4.2.1.g3d5c-dirty



-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!