aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2025-02-06 14:46:15 +0000
committerWerner Koch <[email protected]>2025-02-06 14:46:15 +0000
commitda9fb6bd163d3fe75e0f6761539f27c28cfd0e04 (patch)
treec8a2b39cc0ad4fcb5f4b91a3c841bf058d52c4e5 /g10
parentgpgscm: Fix possible segv in the process functions. (diff)
downloadgnupg-da9fb6bd163d3fe75e0f6761539f27c28cfd0e04.tar.gz
gnupg-da9fb6bd163d3fe75e0f6761539f27c28cfd0e04.zip
kbx: Fix for building without keyboxd.
* kbx/keybox-fwddecl.h: New. * kbx/keybox.h: Replace typedef for KEYBOX_HANDLE by including the new file. * g10/keydb-private.h: Ditto. -- The duplicated typedef was a bit ugly and will fail, depending on compiler, iof for example building without keyboxd. Fix only tested in the standard case but the fix is obvious.
Diffstat (limited to 'g10')
-rw-r--r--g10/keydb-private.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/keydb-private.h b/g10/keydb-private.h
index 1b661a423..dae05d658 100644
--- a/g10/keydb-private.h
+++ b/g10/keydb-private.h
@@ -23,13 +23,7 @@
#include <assuan.h>
#include "../common/membuf.h"
-
-
-/* Ugly forward declarations. */
-struct keyring_handle;
-typedef struct keyring_handle *KEYRING_HANDLE;
-struct keybox_handle;
-typedef struct keybox_handle *KEYBOX_HANDLE;
+#include "../kbx/keybox-fwddecl.h"
/* This is for keydb.c and only used in non-keyboxd mode. */