From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Faye-Lund Subject: [PATCH v6 03/16] compat: add inet_pton and inet_ntop prototypes Date: Wed, 3 Nov 2010 17:31:21 +0100 Message-ID: <1288801894-1168-4-git-send-email-kusmabite@gmail.com> References: <1288801894-1168-1-git-send-email-kusmabite@gmail.com> Cc: gitster@pobox.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Nov 03 17:32:16 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PDgFo-0001tf-9w for gcvg-git-2@lo.gmane.org; Wed, 03 Nov 2010 17:32:04 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755831Ab0KCQbx (ORCPT ); Wed, 3 Nov 2010 12:31:53 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:37501 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755809Ab0KCQbv (ORCPT ); Wed, 3 Nov 2010 12:31:51 -0400 Received: by mail-ew0-f46.google.com with SMTP id 7so391724ewy.19 for ; Wed, 03 Nov 2010 09:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=4xTRfengQmPa7vAPwX43+ZFHjotYT1i3S0BjQpWmM7c=; b=XRFjpL8nwy7StGlUGZtlGS6gH1Jy1L7enhjfNvgxeKgLHSpH7TIP/DQqsgp+xBUC/c UjEivle6+0h18DLx9RTyVoQVYS0PBWYc/2tDecFf3zvXa/P2Cn9sJ3lJK2kFqtfyjCFR 2QStxgc3D8xfLLhGhDlX2CrESNr3WD21GsAQo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=qKYkdSS1VE/XeQi7nxMrT5DCsrDI11WYyN3FwXwDLzFOPL+NCZrINdOZ8EIRjgDXFq xIqS6WnTMAHJx+AWGxN3vbaPexex0NUsPbVPwnSBANdlY8XMXLHHDnjuwAMfLUzGiFqD +9u/nzqO3tPpaUEB3RiGwRPtTOUutTlKXFYWo= Received: by 10.14.48.78 with SMTP id u54mr823109eeb.27.1288801911297; Wed, 03 Nov 2010 09:31:51 -0700 (PDT) Received: from localhost ([77.40.159.131]) by mx.google.com with ESMTPS id x54sm6719967eeh.23.2010.11.03.09.31.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 03 Nov 2010 09:31:49 -0700 (PDT) X-Mailer: git-send-email 1.7.2.3.msysgit.0.2.g22c0a In-Reply-To: <1288801894-1168-1-git-send-email-kusmabite@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Mike Pape Windows doesn't have inet_pton and inet_ntop, so add prototypes in git-compat-util.h for them. At the same time include git-compat-util.h in the sources for these functions, so they use the network-wrappers from there on Windows. Signed-off-by: Mike Pape Signed-off-by: Erik Faye-Lund --- Makefile | 2 ++ compat/inet_ntop.c | 6 +++--- compat/inet_pton.c | 8 +++++--- git-compat-util.h | 8 ++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d9d9419..2aa067a 100644 --- a/Makefile +++ b/Makefile @@ -1398,9 +1398,11 @@ endif endif ifdef NO_INET_NTOP LIB_OBJS += compat/inet_ntop.o + BASIC_CFLAGS += -DNO_INET_NTOP endif ifdef NO_INET_PTON LIB_OBJS += compat/inet_pton.o + BASIC_CFLAGS += -DNO_INET_PTON endif ifdef NO_ICONV diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c index f444982..e5b46a0 100644 --- a/compat/inet_ntop.c +++ b/compat/inet_ntop.c @@ -17,9 +17,9 @@ #include #include -#include -#include -#include + +#include "../git-compat-util.h" + #include #include diff --git a/compat/inet_pton.c b/compat/inet_pton.c index 4078fc0..2ec995e 100644 --- a/compat/inet_pton.c +++ b/compat/inet_pton.c @@ -17,9 +17,9 @@ #include #include -#include -#include -#include + +#include "../git-compat-util.h" + #include #include @@ -41,7 +41,9 @@ */ static int inet_pton4(const char *src, unsigned char *dst); +#ifndef NO_IPV6 static int inet_pton6(const char *src, unsigned char *dst); +#endif /* int * inet_pton4(src, dst) diff --git a/git-compat-util.h b/git-compat-util.h index e192831..56dce85 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -387,6 +387,14 @@ static inline void *gitmempcpy(void *dest, const void *src, size_t n) } #endif +#ifdef NO_INET_PTON +int inet_pton(int af, const char *src, void *dst); +#endif + +#ifdef NO_INET_NTOP +const char *inet_ntop(int af, const void *src, char *dst, size_t size); +#endif + extern void release_pack_memory(size_t, int); typedef void (*try_to_free_t)(size_t); -- 1.7.3.2.161.gd6e00