summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/include/sequoia/openpgp/crypto.h
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2019-03-11 08:47:21 +0100
committerNeal H. Walfield <neal@pep.foundation>2019-03-11 09:42:16 +0100
commit220d1ab8ffe3c3bbec99c6143a9f480df4955e5b (patch)
tree042de383050ae621b72772982fd27fb151324c0c /openpgp-ffi/include/sequoia/openpgp/crypto.h
parent930d8b9b87384a0115d292434fbe831278151a76 (diff)
openpgp-ffi: Move all type declarations to <sequoia/openpgp/types.h>
- pgp_key_t was declared multiple times, once in <sequoia/openpgp.h> and again in <sequoia/openpgp/crypto.h>. Although the definitions were the same, this causes gcc to emit a warning, which is particularly annoying when combined with -Werror. - It's hard to remove one of the declarations as this would create a circular dependency. - To break this circular dependency, we move all of the type declarations to a separate header file.
Diffstat (limited to 'openpgp-ffi/include/sequoia/openpgp/crypto.h')
-rw-r--r--openpgp-ffi/include/sequoia/openpgp/crypto.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/openpgp-ffi/include/sequoia/openpgp/crypto.h b/openpgp-ffi/include/sequoia/openpgp/crypto.h
index 00d49466..530208a0 100644
--- a/openpgp-ffi/include/sequoia/openpgp/crypto.h
+++ b/openpgp-ffi/include/sequoia/openpgp/crypto.h
@@ -1,6 +1,8 @@
#ifndef SEQUOIA_OPENPGP_CRYPTO_H
#define SEQUOIA_OPENPGP_CRYPTO_H
+#include <sequoia/openpgp/types.h>
+
typedef struct pgp_mpi *pgp_mpi_t;
/*/
@@ -26,9 +28,6 @@ void pgp_signer_free (pgp_signer_t s);
/*/
typedef struct pgp_key_pair *pgp_key_pair_t;
-/* Forward declaration. */
-typedef struct pgp_key *pgp_key_t;
-
/*/
/// Creates a new key pair.
/*/