summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pape <dotzenlabs@gmail.com>2010-11-04 01:35:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-04 23:53:49 (GMT)
commitda523cc597b1be7fe61ee870cf93b142e70fab7f (patch)
tree38149dba3a2f29a898352874895bd03f4d79649d /Makefile
parent088d880247dc7bb1a27f07e320bab7f9b63e06bc (diff)
downloadgit-da523cc597b1be7fe61ee870cf93b142e70fab7f.zip
git-da523cc597b1be7fe61ee870cf93b142e70fab7f.tar.gz
git-da523cc597b1be7fe61ee870cf93b142e70fab7f.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 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