1 files changed, 6 insertions, 1 deletions
diff --git a/g10/g10.c b/g10/g10.c
index fe4c89a70..b70a2c810 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1463,10 +1463,15 @@ parse_list_options(char *str)
       {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL},
       {"show-keyring",LIST_SHOW_KEYRING,NULL},
       {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL},
-      {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,&subpackets},
+      {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL},
       {NULL,0,NULL}
     };
 
+  /* C99 allows for non-constant initializers, but we'd like to
+  compile everywhere, so fill in the show-sig-subpackets argument
+  here. */
+  lopts[12].value=&subpackets;
+
   if(parse_options(str,&opt.list_options,lopts,1))
     {
       if(opt.list_options&LIST_SHOW_SIG_SUBPACKETS)