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>
Shawn O. Pearce committed
Nov 9, 2009 at 07:24 UTC
92815b3363c6cf317337437a986bdf2e8f1aa3a0
1 file changed
+5
-5
http-backend.c
+5
-5
@@ -209,7 +209,7 @@ static void send_strbuf(const char *type, struct strbuf *buf)
209
safe_write(1, buf->buf, buf->len);
210
}
211
212
-static void send_file(const char *the_type, const char *name)
212
+static void send_local_file(const char *the_type, const char *name)
213
{
214
const char *p = git_path("%s", name);
215
size_t buf_alloc = 8192;
@@ -247,28 +247,28 @@ static void get_text_file(char *name)
247
{
248
select_getanyfile();
249
hdr_nocache();
250
- send_file("text/plain", name);
250
+ send_local_file("text/plain", name);
251
}
252
253
static void get_loose_object(char *name)
254
{
255
select_getanyfile();
256
hdr_cache_forever();
257
- send_file("application/x-git-loose-object", name);
257
+ send_local_file("application/x-git-loose-object", name);
258
}
259
260
static void get_pack_file(char *name)
261
{
262
select_getanyfile();
263
hdr_cache_forever();
264
- send_file("application/x-git-packed-objects", name);
264
+ send_local_file("application/x-git-packed-objects", name);
265
}
266
267
static void get_idx_file(char *name)
268
{
269
select_getanyfile();
270
hdr_cache_forever();
271
- send_file("application/x-git-packed-objects-toc", name);
271
+ send_local_file("application/x-git-packed-objects-toc", name);
272
}
273
274
static int http_config(const char *var, const char *value, void *cb)