diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 68b1eb1fb..3435f2915 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2007-08-02 Werner Koch <[email protected]> + + * gpg.c: Include gc-opt-flags.h and remove their definition here. + 2007-07-17 Werner Koch <[email protected]> * gpg.c (gpgconf_list): Declare --encrypt-to and --default-key. @@ -55,7 +55,7 @@ #include "status.h" #include "keyserver-internal.h" #include "exec.h" - +#include "gc-opt-flags.h" #if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) #define MY_O_BINARY O_BINARY @@ -1457,10 +1457,6 @@ gpgconf_list (const char *configfile) { char *configfile_esc = percent_escape (configfile, NULL); - /* The following definitions are taken from gnupg/tools/gpgconf-comp.c. */ -#define GC_OPT_FLAG_NONE 0UL -#define GC_OPT_FLAG_DEFAULT (1UL << 4) - printf ("gpgconf-gpg.conf:%lu:\"%s\n", GC_OPT_FLAG_DEFAULT, configfile_esc ? configfile_esc : "/dev/null"); printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE); |