diff options
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 4 | ||||
| -rw-r--r-- | kbx/keybox-defs.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 333c28695..9762add2a 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -34,11 +34,11 @@ #include "../common/stringhelp.h" #include "../common/utf8conv.h" #include "i18n.h" -#include "init.h" #include "keybox-defs.h" - +#include "../common/init.h" #include <gcrypt.h> + enum cmd_and_opt_values { aNull = 0, oArmor = 'a', diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index aad07f9d6..9a2930239 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -21,9 +21,12 @@ #define KEYBOX_DEFS_H 1 #ifdef GPG_ERR_SOURCE_DEFAULT -#error GPG_ERR_SOURCE_DEFAULT already defined +# if GPG_ERR_SOURCE_DEFAULT != GPG_ERR_SOURCE_KEYBOX +# error GPG_ERR_SOURCE_DEFAULT already defined +# endif +#else +# define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX #endif -#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX #include <gpg-error.h> #define map_assuan_err(a) \ map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) |