summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Pugin <egor.pugin@gmail.com>2019-03-28 19:06:12 +0300
committerBehdad Esfahbod <behdad@behdad.org>2019-03-28 11:10:42 -0700
commitcf040c0fef4a049a75a5ec7972f518b9034bdc76 (patch)
tree2cde71549128e79b8c06e1a79e3428dc5715e1f0
parent717181c5943c13a682c719dce10bfc3d9cc47e6b (diff)
Disable unwanted C++ definitions for MSVC.
MSVC does not set __cplusplus to the latest standard and also it does not like redefining some keywords.
-rw-r--r--src/hb.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hb.hh b/src/hb.hh
index 5b66ba85..67f09b98 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