From 84fa3f9f72e1221c5cd9e0723bffd0c4475e4914 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 2 Jan 2021 19:27:13 +0000 Subject: Redundant code path cleanup (#1702) Remove various obsolete configure options. Remove Adjust SDK install tracking filth. Remove redundant code paths in old-configure This also optimizes linker use Remove redundant conditional blocks. Rewrite span.h without constexpr use. --- gfx/harfbuzz/src/hb-common.h | 10 ---------- gfx/harfbuzz/src/hb-private.hh | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'gfx/harfbuzz/src') diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h index 2cbee76a8..2e17d4bb0 100644 --- a/gfx/harfbuzz/src/hb-common.h +++ b/gfx/harfbuzz/src/hb-common.h @@ -51,16 +51,6 @@ # include #elif defined (_AIX) # include -/* VS 2010 (_MSC_VER 1600) has stdint.h */ -#elif defined (_MSC_VER) && _MSC_VER < 1600 -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; #else # include #endif diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh index 666af6260..c1418d8a5 100644 --- a/gfx/harfbuzz/src/hb-private.hh +++ b/gfx/harfbuzz/src/hb-private.hh @@ -178,9 +178,7 @@ static int errno = 0; /* Use something better? */ # elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) # define getenv(Name) NULL # endif -# if defined(_MSC_VER) && _MSC_VER < 1900 -# define snprintf _snprintf -# elif defined(_MSC_VER) && _MSC_VER >= 1900 +# if defined(_MSC_VER) # /* Covers VC++ Error for strdup being a deprecated POSIX name and to instead use _strdup instead */ # define strdup _strdup # endif -- cgit v1.2.3