diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/llwindow | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/llwindow')
| -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 | ||