From 7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 10 Feb 2014 19:48:42 +0100
Subject: gpg: Cleanup compiler warnings due to some configure options.

* g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
unused.
* tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
not configured.
---
 g10/photoid.c        | 9 +++++++--
 tools/gpgconf-comp.c | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/g10/photoid.c b/g10/photoid.c
index 3728cd076..132adca17 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -287,7 +287,12 @@ void
 show_photos(const struct user_attribute *attrs, int count,
             PKT_public_key *pk, PKT_user_id *uid)
 {
-#ifndef DISABLE_PHOTO_VIEWER
+#ifdef DISABLE_PHOTO_VIEWER
+  (void)attrs;
+  (void)count;
+  (void)pk;
+  (void)uid;
+#else /*!DISABLE_PHOTO_VIEWER*/
   int i;
   struct expando_args args;
   u32 len;
@@ -367,5 +372,5 @@ show_photos(const struct user_attribute *attrs, int count,
 
  fail:
   log_error(_("unable to display photo ID!\n"));
-#endif
+#endif /*!DISABLE_PHOTO_VIEWER*/
 }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 024417ef5..dda4c9a3f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1230,8 +1230,11 @@ my_dgettext (const char *domain, const char *msgid)
       return text ? text : msgid;
     }
   else
-#endif
     return msgid;
+#else
+  (void)domain;
+  return msgid;
+#endif
 }
 
 
-- 
cgit v1.2.3