[PATCH 1/3] http-backend: Fix symbol clash on AIX 5.3
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:47:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Mike says:
quoted
+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 <redacted> Signed-off-by: Shawn O. Pearce <redacted> --- http-backend.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/http-backend.c b/http-backend.c
index 9021266..646e910 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)
--
1.6.5.2.351.g09432