From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Faye-Lund Subject: [PATCH v3 03/14] compat: add inet_pton and inet_ntop prototypes Date: Sun, 10 Oct 2010 15:20:43 +0200 Message-ID: <1286716854-5744-4-git-send-email-kusmabite@gmail.com> References: <1286716854-5744-1-git-send-email-kusmabite@gmail.com> Cc: msysgit@googlegroups.com, j6t@kdbg.org, Mike Pape To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 10 15:21:54 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 1P4vqb-0004eR-3c for gcvg-git-2@lo.gmane.org; Sun, 10 Oct 2010 15:21:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757618Ab0JJNVu (ORCPT ); Sun, 10 Oct 2010 09:21:50 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:54307 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751784Ab0JJNVt (ORCPT ); Sun, 10 Oct 2010 09:21:49 -0400 Received: by mail-ew0-f46.google.com with SMTP id 20so255794ewy.19 for ; Sun, 10 Oct 2010 06:21:48 -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=icLT/kC9tsaVfOLiiYubws4CPz7EYzmp/GQUOto7DBs=; b=HDWZ1kneCfMq5+i2OEA9BrA1TbBnG6HI6Rly20ZQdeiDRQwaPVfzMJz7oxuVokDcc1 fIwGe7eOeakmUnNYBvgttQpaxKXTOjRgkT0Qi94L66tMfPjqtFHZwQpgRH6daIK3FWTI 4XT6PJBW4qf14s6KP6Lpq2vToxrKrzljcu0r4= 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=T9q6hTbAp65ZGec3KFzsgYMzw+RM1oejvXie0ShAbtRQBPFqks6AMooasWpYjQl3nh IzmPu1rlsgHFTxkmn6BKrVKFX9/j3Tlh44TC2p+sLuvugDLNSho2x+OtKB44eAi8X497 +yCpLfItPm2+mQe1w2pgKvacxNlVSods6QxdY= Received: by 10.14.45.77 with SMTP id o53mr482109eeb.1.1286716908640; Sun, 10 Oct 2010 06:21:48 -0700 (PDT) Received: from localhost (cm-84.215.188.225.getinternet.no [84.215.188.225]) by mx.google.com with ESMTPS id v59sm9036461eeh.4.2010.10.10.06.21.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 10 Oct 2010 06:21:47 -0700 (PDT) X-Mailer: git-send-email 1.7.3.165.gdfe39.dirty In-Reply-To: <1286716854-5744-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 1f1ce04..ebb51e3 100644 --- a/Makefile +++ b/Makefile @@ -1397,9 +1397,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 8770854..100197f 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.1.51.ge462f.dirty