From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Faye-Lund Subject: [PATCH/RFC 04/11] compat: add inet_pton and inet_ntop prototypes Date: Thu, 26 Nov 2009 00:39:11 +0000 Message-ID: <1259195958-2372-5-git-send-email-kusmabite@gmail.com> References: <1259195958-2372-1-git-send-email-kusmabite@gmail.com> <1259195958-2372-2-git-send-email-kusmabite@gmail.com> <1259195958-2372-3-git-send-email-kusmabite@gmail.com> <1259195958-2372-4-git-send-email-kusmabite@gmail.com> Cc: git@vger.kernel.org, dotzenlabs@gmail.com, Erik Faye-Lund To: msysgit@googlecode.com X-From: git-owner@vger.kernel.org Thu Nov 26 01:39:47 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NDSOe-0007oi-Bh for gcvg-git-2@lo.gmane.org; Thu, 26 Nov 2009 01:39:44 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935052AbZKZAjb (ORCPT ); Wed, 25 Nov 2009 19:39:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935015AbZKZAjb (ORCPT ); Wed, 25 Nov 2009 19:39:31 -0500 Received: from mail-ew0-f219.google.com ([209.85.219.219]:41835 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935003AbZKZAja (ORCPT ); Wed, 25 Nov 2009 19:39:30 -0500 Received: by mail-ew0-f219.google.com with SMTP id 19so295613ewy.21 for ; Wed, 25 Nov 2009 16:39:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=oQ6P9Of9YaasR1N0m5D0Bami39TmoSjcS/ppTj7zkGg=; b=BJGJWChxP+n62akouCR14Ne+yjCQBdILJSYeMTLW0HYExnQS3xZjfpWk43VsVj6/SQ CtKqV8QbltdVj7xKpIhnRjkSR1GKWx2pagwf02g061lMBUowv1wascyPGkm6+3xv9I60 SxYFxDG+8dIJ/im453jE+vMmnMqZXqn+fYm7Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Uo7rzxVscREW8ehTGIo1IM3+B1tADhNTXTWCzKCU8rUXLro47cHYRGMz1Vwd61UxD3 E0ZPCjEtOsn20T6gsoq/WJiCvchIGlVRdHA3az47Ru7cXndAmO5N4m+1AUYb7sWVPjqX T6pzpN/FynqDGtgxKhCFwf56Y5JAISLfF2/34= Received: by 10.213.63.14 with SMTP id z14mr7370436ebh.17.1259195976595; Wed, 25 Nov 2009 16:39:36 -0800 (PST) Received: from localhost (cm-84.215.142.12.getinternet.no [84.215.142.12]) by mx.google.com with ESMTPS id 23sm384252eya.35.2009.11.25.16.39.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 25 Nov 2009 16:39:36 -0800 (PST) X-Mailer: git-send-email 1.6.4 In-Reply-To: <1259195958-2372-4-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 70cee6d..3b01694 100644 --- a/Makefile +++ b/Makefile @@ -1227,9 +1227,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 33a8e33..27fa601 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -340,6 +340,14 @@ static inline char *gitstrchrnul(const char *s, int c) } #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); extern char *xstrdup(const char *str); -- 1.6.5.rc2.7.g4f8d3