compat: add inet_pton and inet_ntop prototypes
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
088d880247
commit
da523cc597
2
Makefile
2
Makefile
@ -1398,9 +1398,11 @@ endif
|
|||||||
endif
|
endif
|
||||||
ifdef NO_INET_NTOP
|
ifdef NO_INET_NTOP
|
||||||
LIB_OBJS += compat/inet_ntop.o
|
LIB_OBJS += compat/inet_ntop.o
|
||||||
|
BASIC_CFLAGS += -DNO_INET_NTOP
|
||||||
endif
|
endif
|
||||||
ifdef NO_INET_PTON
|
ifdef NO_INET_PTON
|
||||||
LIB_OBJS += compat/inet_pton.o
|
LIB_OBJS += compat/inet_pton.o
|
||||||
|
BASIC_CFLAGS += -DNO_INET_PTON
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NO_ICONV
|
ifdef NO_ICONV
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
#include "../git-compat-util.h"
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
#include "../git-compat-util.h"
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -41,7 +41,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static int inet_pton4(const char *src, unsigned char *dst);
|
static int inet_pton4(const char *src, unsigned char *dst);
|
||||||
|
#ifndef NO_IPV6
|
||||||
static int inet_pton6(const char *src, unsigned char *dst);
|
static int inet_pton6(const char *src, unsigned char *dst);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* int
|
/* int
|
||||||
* inet_pton4(src, dst)
|
* inet_pton4(src, dst)
|
||||||
|
@ -387,6 +387,14 @@ static inline void *gitmempcpy(void *dest, const void *src, size_t n)
|
|||||||
}
|
}
|
||||||
#endif
|
#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 void release_pack_memory(size_t, int);
|
||||||
|
|
||||||
typedef void (*try_to_free_t)(size_t);
|
typedef void (*try_to_free_t)(size_t);
|
||||||
|
Loading…
Reference in New Issue
Block a user