From da9fb6bd163d3fe75e0f6761539f27c28cfd0e04 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 6 Feb 2025 15:46:15 +0100 Subject: 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. --- g10/keydb-private.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'g10/keydb-private.h') 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 #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. */ -- cgit v1.2.3