From 0d654102fcb5b1aae70e7c3f565ab208455f8f36 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 23 Nov 2010 19:41:47 -0700
Subject: Fixed Windows compile error introduced in fe9a3d2b. Also made sure
 winsock2.h is always included before windows.h throughout the source to
 prevent collisions

---
 linden/indra/media_plugins/webkit/windows_volume_catcher.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/indra/media_plugins/webkit/windows_volume_catcher.cpp')

diff --git a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
index f1afea7..64f70c4 100644
--- a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
+++ b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
@@ -34,6 +34,8 @@
  */
 
 #include "volume_catcher.h"
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
 #include <windows.h>
 #include "llmemory.h"
 class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
-- 
cgit v1.1