diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-03-28 17:19:35 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 17:19:35 +1300 |
| commit | 85d74a506f6e4024ae1ffdf857d68ebed96fa4a9 (patch) | |
| tree | 615c4104ef8ab87cdc6267b9f856140eab025aa8 /Source/Core/Common/StringUtil.cpp | |
| parent | 8c23888968cbc8b513c5b45df5014213ba356bc1 (diff) | |
| parent | 0831dad467374f11256b5e63ca66b9dff5bf2463 (diff) | |
Merge pull request #4951 from waddlesplash/haiku-2
Initial support for Haiku.
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/StringUtil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index d08e98b7ff..da1feb033e 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -30,7 +30,7 @@ #include <locale.h> #endif -#if !defined(_WIN32) && !defined(ANDROID) && !defined(__OpenBSD__) +#if !defined(_WIN32) && !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__) static locale_t GetCLocale() { static locale_t c_locale = newlocale(LC_ALL_MASK, "C", nullptr); @@ -123,11 +123,11 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar c_locale = _create_locale(LC_ALL, "C"); writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); #else -#if !defined(ANDROID) && !defined(__OpenBSD__) +#if !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__) locale_t previousLocale = uselocale(GetCLocale()); #endif writtenCount = vsnprintf(out, outsize, format, args); -#if !defined(ANDROID) && !defined(__OpenBSD__) +#if !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__) uselocale(previousLocale); #endif #endif @@ -164,12 +164,12 @@ std::string StringFromFormatV(const char* format, va_list args) std::string temp = buf; delete[] buf; #else -#if !defined(ANDROID) && !defined(__OpenBSD__) +#if !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__) locale_t previousLocale = uselocale(GetCLocale()); #endif if (vasprintf(&buf, format, args) < 0) ERROR_LOG(COMMON, "Unable to allocate memory for string"); -#if !defined(ANDROID) && !defined(__OpenBSD__) +#if !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__) uselocale(previousLocale); #endif |