diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2013-01-31 18:30:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 12:39:59 -0800 |
| commit | 4ab7527458a908b51891cbaa6bc0da9b711ebd19 (patch) | |
| tree | 1c60cc67e8b060268d101354c2da163ea559c28f | |
| parent | 41f2999180f5a58f2a4214d896359c1587c9024f (diff) | |
| download | git-4ab7527458a908b51891cbaa6bc0da9b711ebd19.tar.gz | |
msvc: git-daemon: Fix linker "unresolved external" errors
In particular, while linking git-daemon.exe, the linker complains
that the external symbols _inet_pton and _inet_ntop are unresolved.
Commit a666b472 ("daemon: opt-out on features that require posix",
04-11-2010) addressed this problem for MinGW by configuring the
use of the internal 'compat' versions of these function.
Although the MSVC header <WS2tcpip.h> contains the prototypes for
the inet_pton and inet_ntop functions, they are only visible for
Windows API versions from 0x0600 (Windows Vista) or later. (In
addition, on Windows XP, ws2_32.dll does not export these symbols).
In order to fix the linker errors, we also configure the MSVC build
to use the internal compat versions of these functions by setting
the NO_INET_{PTON,NTOP} build variables.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Tested-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | config.mak.uname | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 8743a6d0af..911c13ec75 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -344,6 +344,8 @@ ifeq ($(uname_S),Windows) NO_CURL = YesPlease NO_PYTHON = YesPlease BLK_SHA1 = YesPlease + NO_INET_PTON = YesPlease + NO_INET_NTOP = YesPlease NO_POSIX_GOODIES = UnfortunatelyYes NATIVE_CRLF = YesPlease DEFAULT_HELP_FORMAT = html |