Move the GNUTLS_NO_EXTENSIONS compatibility #define to gnutls.h

Signed-off-by: Adrian Bunk <bunk@debian.org>

diff --git a/lib/ext/ext_master_secret.h b/lib/ext/ext_master_secret.h
index 45d38178bd8cd58d9add4d98f0f4a52505b73d87..419335b4e323af1bbd1bd97685e07bdcda65c803 100644 (file)
--- a/lib/ext/ext_master_secret.h
+++ b/lib/ext/ext_master_secret.h
@@ -23,9 +23,6 @@
 #ifndef GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
 #define GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
 
-/* Keep backward compatibility */
-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
-
 #include <hello_ext.h>
 
 extern const hello_ext_entry_st ext_mod_ext_master_secret;

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index ec132cb5c3a48275cc1e357c2ef8a050c50c7455..fc64c7a22838f403d383a3c8b52e9194448e9cdc 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -542,6 +542,9 @@ typedef enum {
 #define GNUTLS_ENABLE_CERT_TYPE_NEG 0
 // Here for compatibility reasons
 
+/* Keep backward compatibility */
+#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
+
 /**
  * gnutls_alert_level_t:
  * @GNUTLS_AL_WARNING: Alert of warning severity.

diff --git a/lib/state.h b/lib/state.h
index dc086bcf0d3f4156a7c780ca4b15bb578147dd45..975ceee3a7a14ecd458efa915ae809ce283e965e 100644 (file)
--- a/lib/state.h
+++ b/lib/state.h
@@ -110,7 +110,4 @@ inline static int _gnutls_PRF(gnutls_session_t session, const uint8_t *secret,
 
 #define DEFAULT_CERT_TYPE GNUTLS_CRT_X509
 
-/* Keep backward compatibility */
-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
-
 #endif /* GNUTLS_LIB_STATE_H */