mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
kbx: Fix for GPG_ERR_SOURCE_DEFAULT.
* kbx/keybox-defs.h (GPG_ERR_SOURCE_DEFAULT): Define here, when not defined. * kbx/kbxutil.c: Let keybox-defs.h include gpg-error.h. -- GnuPG-bug-id: 6200 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
598884699d
commit
d55728539f
@ -30,12 +30,11 @@
|
||||
#include <limits.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include <gpg-error.h>
|
||||
#include "keybox-defs.h"
|
||||
#include "../common/logging.h"
|
||||
#include "../common/stringhelp.h"
|
||||
#include "../common/utf8conv.h"
|
||||
#include "../common/i18n.h"
|
||||
#include "keybox-defs.h"
|
||||
#include "../common/init.h"
|
||||
#include <gcrypt.h>
|
||||
|
||||
|
@ -20,11 +20,7 @@
|
||||
#ifndef KEYBOX_DEFS_H
|
||||
#define KEYBOX_DEFS_H 1
|
||||
|
||||
#ifdef GPG_ERR_SOURCE_DEFAULT
|
||||
# if GPG_ERR_SOURCE_DEFAULT != GPG_ERR_SOURCE_KEYBOX
|
||||
# error GPG_ERR_SOURCE_DEFAULT already defined
|
||||
# endif
|
||||
#else
|
||||
#ifndef GPG_ERR_SOURCE_DEFAULT
|
||||
#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX
|
||||
#endif
|
||||
#include <gpg-error.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user