[PATCH/RFC 04/11] compat: add inet_pton and inet_ntop prototypes
- From
Erik Faye-Lund <kusmabite@googlemail.com>
- Date
- Nov 26, 2009, 00:44 UTC
- Message-ID
- <1259196260-3064-5-git-send-email-kusmabite@gmail.com>
- In-Reply-To
- <1259196260-3064-4-git-send-email-kusmabite@gmail.com>
From: Mike Pape <dotzenlabs@gmail.com>
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 <dotzenlabs@gmail.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> --- 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 <errno.h> #include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> + +#include "../git-compat-util.h" + #include <stdio.h> #include <string.h> 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 <errno.h> #include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> + +#include "../git-compat-util.h" + #include <stdio.h> #include <string.h> @@ -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