diff options
| author | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 |
| commit | c136b432140f892a56d4996d5ed77e903ff0b32d (patch) | |
| tree | e1af9a407b0af582349396d8cb51e2e794260d43 /indra/newview/llxmlrpctransaction.cpp | |
| parent | 9d77e030d9a0d23cebce616631677459eec1612c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 0da70d398b..583196fb7a 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -25,6 +25,8 @@ */ #include "llviewerprecompiledheaders.h" +// include this to get winsock2 because openssl attempts to include winsock1 +#include "llwin32headerslean.h" #include <openssl/x509_vfy.h> #include <openssl/ssl.h> #include "llsecapi.h" |