summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-11-14 16:37:16 +0100
committerSimon Josefsson <simon@josefsson.org>2007-11-14 16:37:16 +0100
commitafa9b5ed35c73afb31474aec898f7814e7dd4d43 (patch)
tree170038d7ddaffb745fa52572f94e676ff8edd12b
parent610bd3f31381dd2f802439b73142647783eeea51 (diff)
downloadgnutls-afa9b5ed35c73afb31474aec898f7814e7dd4d43.tar.gz
Move compat mappings to compat.h.
-rw-r--r--includes/gnutls/compat.h2
-rw-r--r--includes/gnutls/gnutls.h.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h
index 7d8b4e18b4..ae1a84446e 100644
--- a/includes/gnutls/compat.h
+++ b/includes/gnutls/compat.h
@@ -83,6 +83,8 @@
#define GNUTLS_E_UNKNOWN_HASH_ALGORITHM GNUTLS_E_UNKNOWN_ALGORITHM
/* OpenPGP stuff renamed in 2.1.x. */
+#define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
+#define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
#define gnutls_openpgp_send_key gnutls_openpgp_send_cert
#define gnutls_openpgp_key_status_t gnutls_openpgp_crt_status_t
#define gnutls_openpgp_key_t gnutls_openpgp_crt_t
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 169e0d15d7..9a917989bb 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -258,8 +258,6 @@ extern "C"
{ GNUTLS_OPENPGP_CERT,
GNUTLS_OPENPGP_CERT_FINGERPRINT
} gnutls_openpgp_crt_status_t;
-#define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
-#define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
typedef enum
{