summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-02-21 12:06:13 +0100
committerSimon Josefsson <simon@josefsson.org>2008-02-21 12:06:13 +0100
commit21788b7ebc85f7ace3806037742386ead382944e (patch)
treeb3d39b8247fb70d1f7e49bdd7438b71e5c8f73c6 /includes
parent019060d55c3e60c6d18a6bd20699bd88ce7b71bd (diff)
downloadgnutls-21788b7ebc85f7ace3806037742386ead382944e.tar.gz
Use better names in gnutls_certificate_print_formats_t.
Diffstat (limited to 'includes')
-rw-r--r--includes/gnutls/compat.h8
-rw-r--r--includes/gnutls/gnutls.h.in6
2 files changed, 10 insertions, 4 deletions
diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h
index a60e8fedc1..baf45a42a9 100644
--- a/includes/gnutls/compat.h
+++ b/includes/gnutls/compat.h
@@ -93,7 +93,13 @@
#define gnutls_openpgp_key_get_id gnutls_openpgp_crt_get_id
#define gnutls_openpgp_key_check_hostname gnutls_openpgp_crt_check_hostname
-/* OpenPGP stuff renamed in 2.2.x. */
+/* OpenPGP stuff renamed in 2.3.x. */
#define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id
+/* New better names renamed in 2.3.x, add these for backwards
+ compatibility with old poor names.*/
+#define GNUTLS_X509_CRT_FULL GNUTLS_CRT_PRINT_FULL
+#define GNUTLS_X509_CRT_ONELINE GNUTLS_CRT_PRINT_ONELINE
+#define GNUTLS_X509_CRT_UNSIGNED_FULL GNUTLS_CRT_PRINT_UNSIGNED_FULL
+
#endif /* GCOMPAT_H */
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index e35c7dc604..d1ce0f1f87 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -282,9 +282,9 @@ extern "C"
typedef enum gnutls_certificate_print_formats
{
- GNUTLS_X509_CRT_FULL,
- GNUTLS_X509_CRT_ONELINE,
- GNUTLS_X509_CRT_UNSIGNED_FULL
+ GNUTLS_CRT_PRINT_FULL,
+ GNUTLS_CRT_PRINT_ONELINE,
+ GNUTLS_CRT_PRINT_UNSIGNED_FULL,
} gnutls_certificate_print_formats_t;
typedef enum