diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-10 23:43:50 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-11 01:56:08 +0300 |
| commit | 9f6b8484dfb7dfa981d8a8ac3693d3f68e32bc12 (patch) | |
| tree | bff0d3ad6bb7643be0510cd604aacef7c76ae4bb /indra/llcommon/llfindlocale.cpp | |
| parent | 901c3cbe09dae85ccc0c1ce0661a7b878293b608 (diff) | |
Re-enable compiler warnings C4127, C4512 & C4706
Disable particular CRT and WinSock API warnings for functions Microsoft considers unsafe/deprecated
Diffstat (limited to 'indra/llcommon/llfindlocale.cpp')
| -rw-r--r-- | indra/llcommon/llfindlocale.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp index e39812bfc4..ac52f90c9f 100644 --- a/indra/llcommon/llfindlocale.cpp +++ b/indra/llcommon/llfindlocale.cpp @@ -157,14 +157,22 @@ canonise_fl(FL_Locale *l) { if (l->lang && 0 == strcmp(l->lang, "en")) { if (l->country && 0 == strcmp(l->country, "UK")) { free((void*)l->country); +#ifdef LL_WINDOWS + l->country = _strdup("GB"); +#else l->country = strdup("GB"); +#endif } } /* ja_JA -> ja_JP */ if (l->lang && 0 == strcmp(l->lang, "ja")) { if (l->country && 0 == strcmp(l->country, "JA")) { free((void*)l->country); +#ifdef LL_WINDOWS + l->country = _strdup("JP"); +#else l->country = strdup("JP"); +#endif } } } |