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/llwindow/GL/glh_extensions.h | |
| 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/llwindow/GL/glh_extensions.h')
| -rw-r--r-- | linden/indra/llwindow/GL/glh_extensions.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h index b936b5d..5b149c9 100644 --- a/linden/indra/llwindow/GL/glh_extensions.h +++ b/linden/indra/llwindow/GL/glh_extensions.h | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | #include <stdio.h> | 17 | #include <stdio.h> |
| 18 | 18 | ||
| 19 | #ifdef _WIN32 | 19 | #ifdef _WIN32 |
| 20 | # define WIN32_LEAN_AND_MEAN | ||
| 21 | # include <winsock2.h> | ||
| 20 | # include <windows.h> | 22 | # include <windows.h> |
| 21 | #endif | 23 | #endif |
| 22 | 24 | ||