From 70aab459aa2df8f13b828a06976969ba83612f36 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Mon, 26 Apr 2010 22:04:10 +0100 Subject: [PATCH] win32: Remove wsock32 from the list of libraries to link Commit 5dddf7c (Add block-sha1 in favour of the mozilla routines 2010-04-14) introduced the "bswap.h" header file which, for x86 or x86-64 machines, provides a "sane" implementation of ntohl() and htonl(). The wsock32 library, on the msvc and MinGW build, is only included in the link to supply the ntohl()/htonl() routines. Since we now have a built-in implementation, we can remove the wsock32 library from the link. [This will break a Windows build on a non-intel machine] Signed-off-by: Ramsay Jones --- tests/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index beaa5abd5..c059510ad 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -32,13 +32,13 @@ ifeq ($(uname_S),Windows) LD_OUT=-out: CC_OUT=-Fo - LIBS = ..\\libgit2.a libz.lib wsock32.lib + LIBS = ..\\libgit2.a libz.lib CRYPTO_LIB = libeay32.lib endif ifneq (,$(findstring MINGW,$(uname_S))) OS=win32 - EXTRA_LIBS += -lwsock32 -lpthread + EXTRA_LIBS += -lpthread endif -include ../config.mak