From 13ae138af3e108eb81a0df907f1232f581245091 Mon Sep 17 00:00:00 2001 From: Egor Pugin Date: Thu, 28 Mar 2019 19:06:12 +0300 Subject: [PATCH] Disable unwanted C++ definitions for MSVC. MSVC does not set __cplusplus to the latest standard and also it does not like redefining some keywords. --- src/hb.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb.hh b/src/hb.hh index 5b66ba85d..67f09b981 100644 --- a/src/hb.hh +++ b/src/hb.hh @@ -214,7 +214,7 @@ extern "C" int hb_memalign_impl(void **memptr, size_t alignment, size_t size); * Compiler attributes */ -#if __cplusplus < 201103L +#if __cplusplus < 201103L && !defined(_MSC_VER) #ifndef nullptr #define nullptr NULL