summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-11-14 17:10:36 +0100
committerSimon Josefsson <simon@josefsson.org>2007-11-14 17:10:36 +0100
commit4000b37b2c07667536f060af1395073510ddba20 (patch)
tree38d5e71c0d0a26be0973c81ce34fd453470215a6
parente60e0c5219aa35c6760c0e90d2249b3a31c529cd (diff)
downloadgnutls-4000b37b2c07667536f060af1395073510ddba20.tar.gz
Move compat stuff to compat.h.
-rw-r--r--includes/gnutls/compat.h1
-rw-r--r--includes/gnutls/extra.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h
index ae1a84446e..54e46d1de1 100644
--- a/includes/gnutls/compat.h
+++ b/includes/gnutls/compat.h
@@ -83,6 +83,7 @@
#define GNUTLS_E_UNKNOWN_HASH_ALGORITHM GNUTLS_E_UNKNOWN_ALGORITHM
/* OpenPGP stuff renamed in 2.1.x. */
+#define gnutls_openpgp_key_fmt_t gnutls_openpgp_crt_fmt_t
#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
diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 03c5e054dd..4775951e6d 100644
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
*
* Author: Nikos Mavrogiannopoulos
*
@@ -45,7 +45,6 @@ extern "C"
{ GNUTLS_OPENPGP_FMT_RAW,
GNUTLS_OPENPGP_FMT_BASE64
} gnutls_openpgp_crt_fmt_t;
-#define gnutls_openpgp_key_fmt_t gnutls_openpgp_crt_fmt_t
/**
* gnutls_openpgp_recv_key_func - Callback prototype to get OpenPGP keys