aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2007-07-04 22:14:08 +0000
committerMarcus Brinkmann <[email protected]>2007-07-04 22:14:08 +0000
commit3c606ba127179e26bd23aa890268e3fea5607217 (patch)
tree967b46400b90f19b0fe66f7865809033cf4ce6cb
parentChanged to GPLv3. (diff)
downloadgnupg-3c606ba127179e26bd23aa890268e3fea5607217.tar.gz
gnupg-3c606ba127179e26bd23aa890268e3fea5607217.zip
2007-07-05 Marcus Brinkmann <[email protected]>
* symcryptrun.c (confucius_get_pass): Define orig_codeset if [ENABLE_NLS], not [HAVE_LANGINFO_CODESET].
Diffstat (limited to '')
-rw-r--r--tools/ChangeLog5
-rw-r--r--tools/symcryptrun.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 72298daf0..9ddd3aa05 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-05 Marcus Brinkmann <[email protected]>
+
+ * symcryptrun.c (confucius_get_pass): Define orig_codeset if
+ [ENABLE_NLS], not [HAVE_LANGINFO_CODESET].
+
2007-06-26 Werner Koch <[email protected]>
* gpgconf-comp.c (key_matches_user_or_group) [W32]: Implement user
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index 74d82aa7b..fced86fb7 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -424,7 +424,7 @@ confucius_get_pass (const char *cacheid, int again, int *canceled)
{
int err;
char *pw;
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef ENABLE_NLS
char *orig_codeset = NULL;
#endif