diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /apps/xclock/Clock.c | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'apps/xclock/Clock.c')
| -rw-r--r-- | apps/xclock/Clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/xclock/Clock.c b/apps/xclock/Clock.c index 9322473a7..6dfd9653d 100644 --- a/apps/xclock/Clock.c +++ b/apps/xclock/Clock.c @@ -594,7 +594,7 @@ Initialize (Widget request, Widget new, ArgList args, Cardinal *num_args) w->clock.utf8 = False; if (!no_locale) { - char *time_locale = setlocale(LC_TIME, NULL); + char *time_locale = setlocale(LC_CTYPE, NULL); if (strstr(time_locale, "UTF-8") || strstr(time_locale, "utf8")) { w->clock.utf8 = True; @@ -2217,7 +2217,7 @@ clock_to_utf8(const char *str, int in_len) char *buf; size_t buf_size; size_t ileft, oleft; - const char *inptr; + ICONV_CONST char *inptr; char *outptr; size_t ret; const char *code_set = nl_langinfo(CODESET); |