diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-09-13 16:28:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 17:28:48 +0300 |
| commit | 74205607b7e106f3b7566ef4a4b9c2fcdfa2f83e (patch) | |
| tree | 593cc976564d355a31c364ed2f715e30c86784ef /indra/llcommon/llsdutil.cpp | |
| parent | c892ce9f5cf7582a1eb5ed27de117eedf3c2addc (diff) | |
Clean up Windows build (#2562)
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake
* Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake
* Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default
* Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h
* Clean up includes of Windows API headers
* Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index 12f67208c1..dbd89118c9 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -32,8 +32,7 @@ #include <sstream> #if LL_WINDOWS -# define WIN32_LEAN_AND_MEAN -# include <winsock2.h> // for htonl +# include "llwin32headers.h" // for htonl #elif LL_LINUX # include <netinet/in.h> #elif LL_DARWIN |