diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-04-27 18:53:35 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-04-27 18:53:35 -0700 |
| commit | 753c42a3d56fae539c401cc5da1407e050a58f80 (patch) | |
| tree | ba076397854a07c9bcca3842d46054d3b3f0cbe1 /env_universal_common.cpp | |
| parent | d7f22a0c27cb565bdd010c7ae352d5e7afc4922e (diff) | |
| parent | 97c2ec8dcfe14882bafb2f2c56502427c0ffa1d0 (diff) | |
Merge branch 'master' into death_of_fishd
Diffstat (limited to 'env_universal_common.cpp')
| -rw-r--r-- | env_universal_common.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env_universal_common.cpp b/env_universal_common.cpp index 9913c8c1..e4d52eaa 100644 --- a/env_universal_common.cpp +++ b/env_universal_common.cpp @@ -335,7 +335,7 @@ static wcstring full_escape(const wchar_t *in) { out.push_back(c); } - else if (c <= ASCII_MAX) + else if (c <= (wchar_t)ASCII_MAX) { // See #1225 for discussion of use of ASCII_MAX here append_format(out, L"\\x%.2x", c); |