Skip to content

Commit

Permalink
Git-aware CGI to provide dumb HTTP transport
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
spearce authored and gitster committed Nov 9, 2009
1 parent 7f640b7 commit 92815b3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions http-backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 92815b3

Please sign in to comment.