summaryrefslogtreecommitdiff
path: root/http-backend.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2009-11-09 07:24:33 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-09 09:30:01 -0800
commit92815b3363c6cf317337437a986bdf2e8f1aa3a0 (patch)
tree35aca47fb80577e307006ee4d8d2ff5e310c84de /http-backend.c
parent7f640b778f8cf87159890157a815f1d728573477 (diff)
downloadgit-92815b3363c6cf317337437a986bdf2e8f1aa3a0.tar.gz
Git-aware CGI to provide dumb HTTP transport
http-backend: Fix symbol clash on AIX 5.3 Mike says: > > +static void send_file(const char *the_type, const char *name) > > +{ > > I think a symbol clash here is responsible for a build breakage in > next on AIX 5.3: > > CC http-backend.o > http-backend.c:213: error: conflicting types for `send_file' > /usr/include/sys/socket.h:676: error: previous declaration of `send_file' > gmake: *** [http-backend.o] Error 1 So we rename the function send_local_file(). Reported-by: Mike Ralphson <mike.ralphson@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-backend.c')
-rw-r--r--http-backend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/http-backend.c b/http-backend.c
index 902126675a..646e9108bd 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -209,7 +209,7 @@ static void send_strbuf(const char *type, struct strbuf *buf)
safe_write(1, buf->buf, buf->len);
}
-static void send_file(const char *the_type, const char *name)
+static void send_local_file(const char *the_type, const char *name)
{
const char *p = git_path("%s", name);
size_t buf_alloc = 8192;
@@ -247,28 +247,28 @@ static void get_text_file(char *name)
{
select_getanyfile();
hdr_nocache();
- send_file("text/plain", name);
+ send_local_file("text/plain", name);
}
static void get_loose_object(char *name)
{
select_getanyfile();
hdr_cache_forever();
- send_file("application/x-git-loose-object", name);
+ send_local_file("application/x-git-loose-object", name);
}
static void get_pack_file(char *name)
{
select_getanyfile();
hdr_cache_forever();
- send_file("application/x-git-packed-objects", name);
+ send_local_file("application/x-git-packed-objects", name);
}
static void get_idx_file(char *name)
{
select_getanyfile();
hdr_cache_forever();
- send_file("application/x-git-packed-objects-toc", name);
+ send_local_file("application/x-git-packed-objects-toc", name);
}
static int http_config(const char *var, const char *value, void *cb)