summaryrefslogtreecommitdiff
path: root/src/cguittfont/irrUString.h
diff options
context:
space:
mode:
authormazocomp <33579456+mazocomp@users.noreply.github.com>2018-04-20 20:55:23 +0300
committerSmallJoker <mk939@ymail.com>2018-06-03 17:32:00 +0200
commitf72490950a178ecf667181eb8c2b2243ba400e8d (patch)
treeb5adbb95ce42ee0038680f2a61afd44402826b31 /src/cguittfont/irrUString.h
parent9d3fa874be3509477243272cb23d892879348194 (diff)
downloadminetest-f72490950a178ecf667181eb8c2b2243ba400e8d.tar.gz
minetest-f72490950a178ecf667181eb8c2b2243ba400e8d.tar.bz2
minetest-f72490950a178ecf667181eb8c2b2243ba400e8d.zip
Fix C++11 feature detection for undefined _MSC_VER (#7255)
Diffstat (limited to 'src/cguittfont/irrUString.h')
-rw-r--r--src/cguittfont/irrUString.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cguittfont/irrUString.h b/src/cguittfont/irrUString.h
index eb7abe5a1..5b10e2367 100644
--- a/src/cguittfont/irrUString.h
+++ b/src/cguittfont/irrUString.h
@@ -31,7 +31,7 @@
#ifndef __IRR_USTRING_H_INCLUDED__
#define __IRR_USTRING_H_INCLUDED__
-#if (__cplusplus > 199711L) || (_MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
# define USTRING_CPP0X
# if defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))
# define USTRING_CPP0X_NEWLITERALS