diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-19 09:31:00 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-19 09:31:00 +0000 |
| commit | 444e54ef8c640ecaf29becacc67d4abf3e259451 (patch) | |
| tree | 6f1713a2acac8bf8e9a632a64b95ffe52134feb0 /navit/main.c | |
| parent | 9f2b2f7b8e3b095bfc8bdc53d22c2a54d9206247 (diff) | |
| download | navit-444e54ef8c640ecaf29becacc67d4abf3e259451.tar.gz | |
Fix:core:Fixed some warnings
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4369 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/main.c')
| -rw-r--r-- | navit/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/navit/main.c b/navit/main.c index d33e97800..3db493201 100644 --- a/navit/main.c +++ b/navit/main.c @@ -307,20 +307,17 @@ char *nls_table[][3]={ static void win_set_nls(void) { - wchar_t wcountry[32],wlang[32]; char country[32],lang[32]; int i=0; #ifdef HAVE_API_WIN32_CE + wchar_t wcountry[32],wlang[32]; GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, wlang, sizeof(wlang)); WideCharToMultiByte(CP_ACP,0,wlang,-1,lang,sizeof(lang),NULL,NULL); -#else - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, lang, sizeof(lang)); -#endif -#ifdef HAVE_API_WIN32_CE GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVCTRYNAME, wcountry, sizeof(wcountry)); WideCharToMultiByte(CP_ACP,0,wcountry,-1,country,sizeof(country),NULL,NULL); #else + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, lang, sizeof(lang)); GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVCTRYNAME, country, sizeof(country)); #endif while (nls_table[i][0]) { |