diff options
author | 2016-07-31 11:50:20 +0200 | |
---|---|---|
committer | 2016-07-31 14:41:02 +0200 | |
commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/lib/util/unicode.cpp | |
parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/lib/util/unicode.cpp')
-rw-r--r-- | src/lib/util/unicode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp index 0ddee038eee..83e906e112b 100644 --- a/src/lib/util/unicode.cpp +++ b/src/lib/util/unicode.cpp @@ -161,9 +161,9 @@ int uchar_from_utf16f(unicode_char *uchar, const utf16_char *utf16char, size_t c { utf16_char buf[2] = {0}; if (count > 0) - buf[0] = FLIPENDIAN_INT16(utf16char[0]); + buf[0] = flipendian_int16(utf16char[0]); if (count > 1) - buf[1] = FLIPENDIAN_INT16(utf16char[1]); + buf[1] = flipendian_int16(utf16char[1]); return uchar_from_utf16(uchar, buf, count); } @@ -309,9 +309,9 @@ int utf16f_from_uchar(utf16_char *utf16string, size_t count, unicode_char uchar) rc = utf16_from_uchar(buf, count, uchar); if (rc >= 1) - utf16string[0] = FLIPENDIAN_INT16(buf[0]); + utf16string[0] = flipendian_int16(buf[0]); if (rc >= 2) - utf16string[1] = FLIPENDIAN_INT16(buf[1]); + utf16string[1] = flipendian_int16(buf[1]); return rc; } |