aboutsummaryrefslogtreecommitdiffhomepage
path: root/common.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-11-26 23:18:12 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-11-26 23:18:12 -0800
commit9f5547327e3710303d3cb40b4bc55e74653a70ee (patch)
treea8359fc79e5a5f6a6e3940ef45ac85d667089421 /common.cpp
parentb04fc5a39e59a0889b4fffd3e0456582ae923003 (diff)
Fix for compile error identified in
Diffstat (limited to 'common.cpp')
-rw-r--r--common.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/common.cpp b/common.cpp
index b7cdedc8..9608e31e 100644
--- a/common.cpp
+++ b/common.cpp
@@ -1197,7 +1197,12 @@ static size_t read_unquoted_escape(const wchar_t *input, wcstring *result, bool
case L'U':
{
chars=8;
- max_val = mini(WCHAR_MAX, 0x10FFFF); // Largest Unicode code point - see #1107
+ max_val = WCHAR_MAX;
+
+ // Don't exceed the largest Unicode code point - see #1107
+ if (0x10FFFF < max_val)
+ max_val = (wchar_t)0x10FFFF;
+
break;
}