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/llplugin/llpluginsharedmemory.cpp | |
| 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 '')
| -rwxr-xr-x | linden/indra/llplugin/llpluginsharedmemory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp index 883d7b6..6becb8d 100755 --- a/linden/indra/llplugin/llpluginsharedmemory.cpp +++ b/linden/indra/llplugin/llpluginsharedmemory.cpp | |||
| @@ -84,6 +84,8 @@ | |||
| 84 | #include <sys/mman.h> | 84 | #include <sys/mman.h> |
| 85 | #include <errno.h> | 85 | #include <errno.h> |
| 86 | #elif USE_WIN32_SHARED_MEMORY | 86 | #elif USE_WIN32_SHARED_MEMORY |
| 87 | # define WIN32_LEAN_AND_MEAN | ||
| 88 | # include <winsock2.h> | ||
| 87 | #include <windows.h> | 89 | #include <windows.h> |
| 88 | #endif // USE_APR_SHARED_MEMORY | 90 | #endif // USE_APR_SHARED_MEMORY |
| 89 | 91 | ||