From e181a0f1b0331f81dbafc38b86b6ddaf7e88a15d Mon Sep 17 00:00:00 2001
From: Fish <>
Date: Mon, 3 Mar 2008 06:29:31 +0000
Subject: [PATCH] Win32 fixes.

---
 include/services.h      |  2 +-
 lib/curl/config-win32.h |  2 +-
 lib/curl/curl.vcproj    |  6 +++++-
 lib/nxml/nxml.vcproj    | 42 ++++++++++++++++++++++++-----------------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/include/services.h b/include/services.h
index 63b64437..7386bb77 100644
--- a/include/services.h
+++ b/include/services.h
@@ -66,7 +66,7 @@ typedef struct config {
 	size_t recvq;
 } config;
 
-extern config nsconfig;
+EXPORTVAR extern config nsconfig;
 
 extern ModuleInfo ns_module_info;
 extern Module ns_module;
diff --git a/lib/curl/config-win32.h b/lib/curl/config-win32.h
index 6102f938..c722d84b 100755
--- a/lib/curl/config-win32.h
+++ b/lib/curl/config-win32.h
@@ -350,7 +350,7 @@
 /* ---------------------------------------------------------------- */
 /*                           LDAP SUPPORT                           */
 /* ---------------------------------------------------------------- */
-
+#define CURL_DISABLE_LDAP
 #if defined(CURL_HAS_NOVELL_LDAPSDK) || defined(CURL_HAS_MOZILLA_LDAPSDK)
 #undef CURL_LDAP_HYBRID
 #undef CURL_LDAP_WIN
diff --git a/lib/curl/curl.vcproj b/lib/curl/curl.vcproj
index b8d815f3..7098c89c 100644
--- a/lib/curl/curl.vcproj
+++ b/lib/curl/curl.vcproj
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;BUILDING_LIBCURL"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -399,6 +399,10 @@
 				RelativePath=".\base64.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ca-bundle.h"
+				>
+			</File>
 			<File
 				RelativePath=".\config-win32.h"
 				>
diff --git a/lib/nxml/nxml.vcproj b/lib/nxml/nxml.vcproj
index 065d9c73..878ebc37 100644
--- a/lib/nxml/nxml.vcproj
+++ b/lib/nxml/nxml.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -191,10 +191,18 @@
 				RelativePath=".\mrss_generic.c"
 				>
 			</File>
+			<File
+				RelativePath=".\mrss_options.c"
+				>
+			</File>
 			<File
 				RelativePath=".\mrss_parser.c"
 				>
 			</File>
+			<File
+				RelativePath=".\mrss_search.c"
+				>
+			</File>
 			<File
 				RelativePath=".\mrss_write.c"
 				>
@@ -207,22 +215,6 @@
 				RelativePath=".\nxml_easy.c"
 				>
 			</File>
-			<File
-				RelativePath=".\nxml_free.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nxml_namespace.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nxml_string.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nxml_utf.c"
-				>
-			</File>
 			<File
 				RelativePath=".\nxml_edit.c"
 				>
@@ -231,18 +223,34 @@
 				RelativePath=".\nxml_error.c"
 				>
 			</File>
+			<File
+				RelativePath=".\nxml_free.c"
+				>
+			</File>
 			<File
 				RelativePath=".\nxml_init.c"
 				>
 			</File>
+			<File
+				RelativePath=".\nxml_namespace.c"
+				>
+			</File>
 			<File
 				RelativePath=".\nxml_parser.c"
 				>
 			</File>
+			<File
+				RelativePath=".\nxml_string.c"
+				>
+			</File>
 			<File
 				RelativePath=".\nxml_tools.c"
 				>
 			</File>
+			<File
+				RelativePath=".\nxml_utf.c"
+				>
+			</File>
 			<File
 				RelativePath=".\nxml_write.c"
 				>