diff options
| author | McCabe Maxsted | 2010-11-23 19:41:47 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-23 19:41:47 -0700 |
| commit | 0d654102fcb5b1aae70e7c3f565ab208455f8f36 (patch) | |
| tree | 1f31ebe14171eac8a5c87d324b500d734edde6d0 /linden/indra/media_plugins | |
| parent | Merge remote branch 'aleric/weekly' into weekly (diff) | |
| download | meta-impy-0d654102fcb5b1aae70e7c3f565ab208455f8f36.zip meta-impy-0d654102fcb5b1aae70e7c3f565ab208455f8f36.tar.gz meta-impy-0d654102fcb5b1aae70e7c3f565ab208455f8f36.tar.bz2 meta-impy-0d654102fcb5b1aae70e7c3f565ab208455f8f36.tar.xz | |
Fixed Windows compile error introduced in fe9a3d2b. Also made sure winsock2.h is always included before windows.h throughout the source to prevent collisions
Diffstat (limited to 'linden/indra/media_plugins')
| -rw-r--r-- | linden/indra/media_plugins/webkit/windows_volume_catcher.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include "volume_catcher.h" | 36 | #include "volume_catcher.h" |
| 37 | # define WIN32_LEAN_AND_MEAN | ||
| 38 | # include <winsock2.h> | ||
| 37 | #include <windows.h> | 39 | #include <windows.h> |
| 38 | #include "llmemory.h" | 40 | #include "llmemory.h" |
| 39 | class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl> | 41 | class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl> |