[ooo-build-commit] Branch 'ooo/OOO310' - neon/neon.patch

[Jan Holesovsky]

 neon/neon.patch |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit cd58391149bdfa3a77458699bfc00c9ac01fd35c
Author: Oliver Bolte <obo at openoffice.org>
Date:   Tue Jun 23 06:43:54 2009 +0000

    CWS-TOOLING: integrate CWS tkr22
    2009-06-10 16:22:32 +0200 tkr  r272826 : #100878# ucpdav1 lib has now the patch flag
    2009-06-08 14:38:33 +0200 tkr  r272731 : CWS-TOOLING: rebase CWS tkr22 to branches/OOO310 at 272261 (milestone: OOO310:m12)
    2009-06-08 13:10:16 +0200 tkr  r272728 : #100878# add Wspiapi.h to ne_sockets to prevent win2000 crashes

diff --git a/neon/neon.patch b/neon/neon.patch
index 268a733..b62a64a 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -621,7 +621,17 @@
 +
  #include "ne_request.h" /* for ne_session + ne_request */
  #include "ne_uri.h" /* for ne_uri */
- 
+
+--- misc/neon-0.28.2/src/ne_socket.c	2006-10-30 14:18:51.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_socket.c	2008-07-16 13:32:11.022546400 +0200
+@@ -60,6 +60,7 @@
+ #include <stddef.h>
+ #ifdef USE_GETADDRINFO
+ #include <ws2tcpip.h>
++#include <Wspiapi.h>
+ #endif
+ #endif
+
 --- misc/neon-0.28.2/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
 +++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-01-09 10:31:05.752056400 +0100
 @@ -202,9 +202,48 @@