security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

kbx: Fix for GPG_ERR_SOURCE_DEFAULT.

Browse Source 
* 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:
NIIBE Yutaka 2022-09-14 16:49:31 +09:00
parent 598884699d
commit d55728539f
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kbx/kbxutil.c
View File

@ -30,12 +30,11 @@
#include <limits.h> #include <limits.h>
#include <assert.h> #include <assert.h>
#include <gpg-error.h> #include "keybox-defs.h"
#include "../common/logging.h" #include "../common/logging.h"
#include "../common/stringhelp.h" #include "../common/stringhelp.h"
#include "../common/utf8conv.h" #include "../common/utf8conv.h"
#include "../common/i18n.h" #include "../common/i18n.h"
#include "keybox-defs.h"
#include "../common/init.h" #include "../common/init.h"
#include <gcrypt.h> #include <gcrypt.h>

8
kbx/keybox-defs.h
View File

@ -20,12 +20,8 @@
#ifndef KEYBOX_DEFS_H #ifndef KEYBOX_DEFS_H
#define KEYBOX_DEFS_H 1 #define KEYBOX_DEFS_H 1
#ifdef GPG_ERR_SOURCE_DEFAULT #ifndef GPG_ERR_SOURCE_DEFAULT
# if GPG_ERR_SOURCE_DEFAULT != GPG_ERR_SOURCE_KEYBOX #define 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 #endif
#include <gpg-error.h> #include <gpg-error.h>
#define map_assuan_err(a) \ #define map_assuan_err(a) \