aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/win_updater
diff options
context:
space:
mode:
authorDavid Seikel2011-02-20 17:43:37 +1000
committerDavid Seikel2011-02-20 17:43:37 +1000
commit30cac27887ad0497168efb7d8dbc4209ee8b6a2f (patch)
treee722eeffe993a85552ca31e83c24cff8c1d9e339 /linden/indra/win_updater
parentWork around the endless bitching about webkit failing when you open the searc... (diff)
parentFixed compile error in llmediaplugintest: lingering ll_init_apr (diff)
downloadmeta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.zip
meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.gz
meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.bz2
meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.xz
Merge remote-tracking branch 'mccabe/weekly' into weekly
Diffstat (limited to 'linden/indra/win_updater')
-rw-r--r--linden/indra/win_updater/updater.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5031270..c6fa3c8 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -39,6 +39,8 @@
39// *TODO: Switch to fopen_s, strtok_s, etc. 39// *TODO: Switch to fopen_s, strtok_s, etc.
40#define _CRT_SECURE_NO_DEPRECATE 40#define _CRT_SECURE_NO_DEPRECATE
41 41
42# define WIN32_LEAN_AND_MEAN
43# include <winsock2.h>
42#include <windows.h> 44#include <windows.h>
43#include <wininet.h> 45#include <wininet.h>
44#include <stdio.h> 46#include <stdio.h>