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/llvfs | |
| 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/llvfs')
| -rwxr-xr-x | linden/indra/llvfs/llpidlock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h index efcfd91..6103599 100755 --- a/linden/indra/llvfs/llpidlock.h +++ b/linden/indra/llvfs/llpidlock.h | |||
| @@ -39,6 +39,8 @@ class LLFrameTimer; | |||
| 39 | 39 | ||
| 40 | #if LL_WINDOWS //For windows platform. | 40 | #if LL_WINDOWS //For windows platform. |
| 41 | 41 | ||
| 42 | # define WIN32_LEAN_AND_MEAN | ||
| 43 | # include <winsock2.h> | ||
| 42 | #include <windows.h> | 44 | #include <windows.h> |
| 43 | 45 | ||
| 44 | #else //Everyone Else | 46 | #else //Everyone Else |