Imported Upstream version 2.4.0

[platform/upstream/harfbuzz.git] / src / hb.hh

diff --git a/src/hb.hh b/src/hb.hh
index 5b66ba8..ec24c1a 100644 (file)
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -214,7 +214,8 @@ extern "C" int hb_memalign_impl(void **memptr, size_t alignment, size_t size);
  * Compiler attributes
  */
 
-#if __cplusplus < 201103L
+/* https://github.com/harfbuzz/harfbuzz/issues/1634 */
+#if __cplusplus < 201103L && !defined(_MSC_VER)
 
 #ifndef nullptr
 #define nullptr NULL