From 8d27defa02a67ec06f8ce06b14427b5eba8f54e6 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 12 May 2010 17:40:08 +0000 Subject: 2010-05-12 Marcus Brinkmann * configure.ac: Check for setlocale. src/ 2010-05-12 Marcus Brinkmann * gpgme-tool.c (main): Protect call to setlocale with HAVE_SETLOCALE. --- src/ChangeLog | 3 +++ src/gpgme-tool.c | 2 ++ 2 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index a832b0f9..14b168b2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-05-12 Marcus Brinkmann + * gpgme-tool.c (main): Protect call to setlocale with + HAVE_SETLOCALE. + * Makefile.am (system_components): Remove custom cppflags from RCCOMPILE (because gpg-error adds -idirafter that makes RC bail. [HAVE_W32CE_SYSTEM]: Add w32-ce.h and w32-ce.c, clear diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index f102979d..0f16aac2 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -2908,7 +2908,9 @@ main (int argc, char *argv[]) struct args args; struct gpgme_tool gt; +#ifdef HAVE_SETLOCALE setlocale (LC_ALL, ""); +#endif gpgme_check_version (NULL); #ifdef LC_CTYPE gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); -- cgit v1.2.3