[Libreoffice-commits] .: neon/neon.patch

[Tor Lillqvist]

 neon/neon.patch |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0db16f0dc4a41d3a34698efc5490d9b5cc0dde81
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 16 15:58:42 2011 +0300

    Always link with WS2_32LIB, not WSOCK32LIB

diff --git a/neon/neon.patch b/neon/neon.patch
index 473b886..0f56691 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -492,7 +492,7 @@
 +#endif
 --- misc/neon-0.29.5/src/makefile.mk	2011-02-03 10:32:38.000000000 +0100
 +++ misc/build/neon-0.29.5/src/makefile.mk	2011-02-03 10:26:19.000000000 +0100
-@@ -1 +1,102 @@
+@@ -1,1 +1,99 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
@@ -572,10 +572,7 @@
 +              $(ZLIB3RDLIB)
 +
 +.IF "$(GUI)"=="WNT"
-+	SHL1STDLIBS+= $(WSOCK32LIB)
-+	.IF "$(WINDOWS_VISTA_PSDK)" != ""
-+		SHL1STDLIBS+= $(WS2_32LIB)
-+	.ENDIF
++	SHL1STDLIBS+= $(WS2_32LIB)
 +	SHL1STDLIBS+= $(OPENSSLLIB)
 +.ELSE # WNT
 +	.IF "$(OS)"=="SOLARIS"