gnutls.h: moved all compatibility defines outside the enum

1 files changed, 11 insertions, 8 deletions

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index b28e9010ce..73ac461cd7 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -363,25 +363,28 @@ typedef enum {
  */
 typedef enum {
 	GNUTLS_SERVER = 1,
-#define GNUTLS_SERVER (1)
 	GNUTLS_CLIENT = (1<<1),
-#define GNUTLS_CLIENT (1<<1)
 	GNUTLS_DATAGRAM = (1<<2),
-#define GNUTLS_DATAGRAM (1<<2)
 	GNUTLS_NONBLOCK = (1<<3),
-#define GNUTLS_NONBLOCK (1<<3)
 	GNUTLS_NO_EXTENSIONS = (1<<4),
-#define GNUTLS_NO_EXTENSIONS (1<<4)
 	GNUTLS_NO_REPLAY_PROTECTION = (1<<5),
-#define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
 	GNUTLS_NO_SIGNAL = (1<<6),
-#define GNUTLS_NO_SIGNAL (1<<6)
 	GNUTLS_ALLOW_ID_CHANGE = (1<<7),
-#define GNUTLS_ALLOW_ID_CHANGE (1<<7)
 	GNUTLS_ENABLE_FALSE_START = (1<<8),
 	GNUTLS_FORCE_CLIENT_CERT = (1<<9)
 } gnutls_init_flags_t;
 
+/* compatibility defines (previous versions of gnutls
+ * used defines instead of enumerated values). */
+#define GNUTLS_SERVER (1)
+#define GNUTLS_CLIENT (1<<1)
+#define GNUTLS_DATAGRAM (1<<2)
+#define GNUTLS_NONBLOCK (1<<3)
+#define GNUTLS_NO_EXTENSIONS (1<<4)
+#define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
+#define GNUTLS_NO_SIGNAL (1<<6)
+#define GNUTLS_ALLOW_ID_CHANGE (1<<7)
+
 /**
  * gnutls_alert_level_t:
  * @GNUTLS_AL_WARNING: Alert of warning severity.