diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
| commit | 25f8cbece402c0987e2035eb7721e21a9d2761c3 (patch) | |
| tree | f2408e7d1f7b58f49f8cefc5dda7dd56d08c98f8 /indra/llcommon/llpreprocessor.h | |
| parent | 6f4d7c2d6d363aee60d2f3d1fe4ed4a251aaa11b (diff) | |
| parent | f378d2f95ad751ccf7456f79baba61d6c39f5c36 (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index a528cc7fd8..b499a9ce10 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -98,15 +98,6 @@ # define LL_THREAD_LOCAL __thread #endif -// Static linking with apr on windows needs to be declared. -#if LL_WINDOWS && !LL_COMMON_LINK_SHARED -#ifndef APR_DECLARE_STATIC -#define APR_DECLARE_STATIC // For APR on Windows -#endif -#ifndef APU_DECLARE_STATIC -#define APU_DECLARE_STATIC // For APR util on Windows -#endif -#endif #if defined(LL_WINDOWS) #define BOOST_REGEX_NO_LIB 1 @@ -119,13 +110,6 @@ // Deal with VC++ problems #if LL_MSVC -#ifndef _CRT_SECURE_NO_WARNINGS -#define _CRT_SECURE_NO_WARNINGS // disable warnings for methods considered unsafe -#endif -#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS -#define _WINSOCK_DEPRECATED_NO_WARNINGS // disable deprecated WinSock API warnings -#endif - // level 4 warnings that we need to disable: #pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class #pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class |