summaryrefslogtreecommitdiffstats
path: root/g10/photoid.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-02-10 19:48:42 +0100
committerWerner Koch <wk@gnupg.org>2014-02-10 23:15:28 +0100
commit7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4 (patch)
tree25ac5ec5d8e7b5e3693e68805df5997206e1f5ca /g10/photoid.c
parentgpg: Allow building without any trust model support. (diff)
downloadgnupg2-7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4.tar.xz
gnupg2-7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4.zip
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.
Diffstat (limited to 'g10/photoid.c')
-rw-r--r--g10/photoid.c9
1 files changed, 7 insertions, 2 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*/
}