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/llwin32headers.h | |
| 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/llwin32headers.h')
| -rw-r--r-- | indra/llcommon/llwin32headers.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llcommon/llwin32headers.h b/indra/llcommon/llwin32headers.h index f679adc200..df433deb7a 100644 --- a/indra/llcommon/llwin32headers.h +++ b/indra/llcommon/llwin32headers.h @@ -28,15 +28,8 @@ #define LL_LLWINDOWS_H #ifdef LL_WINDOWS -#ifndef NOMINMAX -#define NOMINMAX -#endif -#undef WIN32_LEAN_AND_MEAN -#include <winsock2.h> -#include <windows.h> -// reset to default, which is lean -#define WIN32_LEAN_AND_MEAN -#undef NOMINMAX +#include <windows.h> // Does not include winsock.h because WIN32_LEAN_AND_MEAN is defined +#include <winsock2.h> // Requires windows.h #endif #endif |