From 21170e1e18976b9e6b0f4c65e48078e20e467e61 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 12 Mar 2012 00:35:47 +0100
Subject: [PATCH] Fix build on Windows

---
 indra/cmake/CARes.cmake          | 1 +
 indra/llmessage/llbuffer.cpp     | 1 +
 indra/llmessage/lldispatcher.cpp | 1 +
 indra/llmessage/llhttpclient.h   | 1 -
 indra/llmessage/llurlrequest.h   | 4 +++-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 37e258194..d18e1ef1e 100644
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -10,6 +10,7 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(ares)
     if (WINDOWS)
+        add_definitions("-DCARES_STATICLIB")
         set(CARES_LIBRARIES areslib)
     elseif (DARWIN)
         set(CARES_LIBRARIES
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp
index 58208dbe1..b604e40ca 100644
--- a/indra/llmessage/llbuffer.cpp
+++ b/indra/llmessage/llbuffer.cpp
@@ -28,6 +28,7 @@
 
 #include "linden_common.h"
 #include "llbuffer.h"
+#include <iterator>
 
 #include "llmath.h"
 #include "llmemtype.h"
diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
index b2dc414a6..7ac3651a7 100644
--- a/indra/llmessage/lldispatcher.cpp
+++ b/indra/llmessage/lldispatcher.cpp
@@ -29,6 +29,7 @@
 #include "lldispatcher.h"
 
 #include <algorithm>
+#include <iterator>
 #include "llstl.h"
 #include "message.h"
 
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index b8ee9389a..dda7d550f 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -34,7 +34,6 @@
 #include <string>
 
 #include <boost/intrusive_ptr.hpp>
-#include <openssl/x509_vfy.h>
 #include "llurlrequest.h"
 #include "llassettype.h"
 #include "llcurl.h"
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 44d358d90..1ba51a5ac 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -38,7 +38,6 @@
 #include "lliopipe.h"
 #include "llchainio.h"
 #include "llerror.h"
-#include <openssl/x509_vfy.h>
 #include "llcurl.h"
 
 
@@ -51,6 +50,9 @@ class LLURLRequestDetail;
 
 class LLURLRequestComplete;
 
+struct x509_store_ctx_st;
+typedef struct x509_store_ctx_st X509_STORE_CTX;
+
 /** 
  * @class LLURLRequest
  * @brief Class to handle url based requests.