From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Faye-Lund Subject: [PATCH v4 03/15] compat: add inet_pton and inet_ntop prototypes Date: Mon, 11 Oct 2010 23:50:17 +0200 Message-ID: <1286833829-5116-4-git-send-email-kusmabite@gmail.com> References: <1286833829-5116-1-git-send-email-kusmabite@gmail.com> Cc: msysgit@googlegroups.com, j6t@kdbg.org, avarab@gmail.com, sunshine@sunshineco.com, Mike Pape To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Oct 11 23:51:46 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 1P5QHW-00065Z-Hd for gcvg-git-2@lo.gmane.org; Mon, 11 Oct 2010 23:51:42 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756530Ab0JKVvb (ORCPT ); Mon, 11 Oct 2010 17:51:31 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:36668 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756491Ab0JKVva (ORCPT ); Mon, 11 Oct 2010 17:51:30 -0400 Received: by mail-ew0-f46.google.com with SMTP id 20so833577ewy.19 for ; Mon, 11 Oct 2010 14:51:29 -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=JsLYgsnoWOBRlX2ZTsnMQ/YqcCq02KuL3OEcPlL/lV0=; b=wvQEeQiLaVo4MW44bSpQU7vll0obc4YzpJRM/0TA9ZoDt4iHbB/EDi7oqmkqYA2S5f ERMB0eV+gr+coBvGjF73T2F54vc2vhbf6G2g49khJ71T+6TRF97vocWomFB7lsyvoDuX SJdrAhCJeVlS0dOQpomdbkhhvUxw4FWmA/Bdo= 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=dJTq7MSvQYxcZO+rdPAJ0/hk72xqiQt+UUBRSY9wYgHUWcMDkI9detNCP1DnLj6ZoM +x4WcA7zd/usNwMH0I0G83mEUpJO2/I9NZgGM7EJnrA3BJBPJLozME1nTgLXOPqKx3oQ loiAGexIydgKIatVKtBeWEPiTXzUZRoaeojFI= Received: by 10.14.47.78 with SMTP id s54mr3638255eeb.20.1286833889695; Mon, 11 Oct 2010 14:51:29 -0700 (PDT) Received: from localhost (cm-84.215.188.225.getinternet.no [84.215.188.225]) by mx.google.com with ESMTPS id v8sm11652273eeh.14.2010.10.11.14.51.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 11 Oct 2010 14:51:28 -0700 (PDT) X-Mailer: git-send-email 1.7.3.165.gdfe39.dirty In-Reply-To: <1286833829-5116-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.1.199.g72340