From 7137c3ffb76486b79e3a3448beb4a30be2f22337 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Mon, 26 Dec 2022 22:22:14 -0400 Subject: [PATCH] Remove #ifdefs supporting old Visual Studio versions. --- src/common/config.h | 11 ++++------- src/common/runtime.cpp | 7 ------- src/libraries/enet/enet.cpp | 7 ------- src/modules/love/love.cpp | 6 ------ 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/common/config.h b/src/common/config.h index 42d3bb27d..373ac4918 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -24,13 +24,10 @@ // Platform stuff. #if defined(WIN32) || defined(_WIN32) # define LOVE_WINDOWS 1 - // If _USING_V110_SDK71_ is defined it means we are using the xp toolset. -# if defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_ -# include -# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -# define LOVE_WINDOWS_UWP 1 -# define LOVE_NO_MODPLUG 1 -# endif +# include +# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +# define LOVE_WINDOWS_UWP 1 +# define LOVE_NO_MODPLUG 1 # endif #endif #if defined(linux) || defined(__linux) || defined(__linux__) diff --git a/src/common/runtime.cpp b/src/common/runtime.cpp index 3b0bd4961..ddf2fa440 100644 --- a/src/common/runtime.cpp +++ b/src/common/runtime.cpp @@ -35,13 +35,6 @@ #include #include -// VS2013 doesn't support alignof -#if defined(_MSC_VER) && _MSC_VER <= 1800 -#define LOVE_ALIGNOF(x) __alignof(x) -#else -#define LOVE_ALIGNOF(x) alignof(x) -#endif - namespace love { diff --git a/src/libraries/enet/enet.cpp b/src/libraries/enet/enet.cpp index bca527cd6..0daa6bae9 100644 --- a/src/libraries/enet/enet.cpp +++ b/src/libraries/enet/enet.cpp @@ -111,13 +111,6 @@ static size_t find_peer_index(lua_State *l, ENetHost *enet_host, ENetPeer *peer) return peer_index; } -// VS2013 doesn't support alignof -#if defined(_MSC_VER) && _MSC_VER <= 1800 -#define ENET_ALIGNOF(x) __alignof(x) -#else -#define ENET_ALIGNOF(x) alignof(x) -#endif - static bool supports_full_lightuserdata(lua_State *L) { static bool checked = false; diff --git a/src/modules/love/love.cpp b/src/modules/love/love.cpp index 99ee86be6..e782f6d7a 100644 --- a/src/modules/love/love.cpp +++ b/src/modules/love/love.cpp @@ -33,12 +33,6 @@ #ifdef LOVE_WINDOWS #include - -#if defined(_MSC_VER) && (_MSC_VER < 1900) -// VS 2013 and earlier doesn't have snprintf -#define snprintf sprintf_s -#endif // defined(_MSC_VER) && (_MSC_VER < 1900) - #endif // LOVE_WINDOWS #ifdef LOVE_ANDROID