Changes to make the --disable-* options work again.

4 files changed, 20 insertions, 23 deletions

diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index 3ad54c1883..4f61f36dbb 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -95,7 +95,7 @@ extern OPENPGP_PRIVKEY_DEINIT _E_gnutls_openpgp_privkey_deinit;
 
 static void _gnutls_add_openpgp_functions(void)
 {
-#ifdef USE_OPENPGP
+#ifdef ENABLE_OPENPGP
     _E_gnutls_openpgp_verify_key = _gnutls_openpgp_verify_key;
     _E_gnutls_openpgp_get_raw_key_expiration_time =
 	_gnutls_openpgp_get_raw_key_expiration_time;
diff --git a/libextra/gnutls_extra.h b/libextra/gnutls_extra.h
index 8f7c06c44e..89a02827e0 100644
--- a/libextra/gnutls_extra.h
+++ b/libextra/gnutls_extra.h
@@ -25,27 +25,25 @@
 #include <auth_cert.h>
 
 typedef int (*OPENPGP_VERIFY_KEY_FUNC) (const
-					gnutls_certificate_credentials_t,
-					const gnutls_datum_t *, int,
-					unsigned int *);
+    gnutls_certificate_credentials_t, const gnutls_datum_t *, int,
+    unsigned int *);
 
 typedef time_t(*OPENPGP_KEY_CREATION_TIME_FUNC) (const gnutls_datum_t *);
 typedef time_t(*OPENPGP_KEY_EXPIRATION_TIME_FUNC) (const gnutls_datum_t *);
 typedef int (*OPENPGP_KEY_REQUEST) (gnutls_session_t, gnutls_datum_t *,
-				    const gnutls_certificate_credentials_t,
-				    opaque *, int);
+    const gnutls_certificate_credentials_t, opaque *, int);
 
 typedef int (*OPENPGP_FINGERPRINT) (const gnutls_datum_t *,
-				    unsigned char *, size_t *);
+    unsigned char *, size_t *);
 
 typedef int (*OPENPGP_RAW_KEY_TO_GCERT) (gnutls_cert *,
-					 const gnutls_datum_t *);
+    const gnutls_datum_t *);
 typedef int (*OPENPGP_RAW_PRIVKEY_TO_GKEY) (gnutls_privkey *,
-					    const gnutls_datum_t *);
+    const gnutls_datum_t *);
 
 typedef int (*OPENPGP_KEY_TO_GCERT) (gnutls_cert *, gnutls_openpgp_key_t);
 typedef int (*OPENPGP_PRIVKEY_TO_GKEY) (gnutls_privkey *,
-					gnutls_openpgp_privkey_t);
-
+    gnutls_openpgp_privkey_t);
 typedef void (*OPENPGP_KEY_DEINIT) (gnutls_openpgp_key_t);
 typedef void (*OPENPGP_PRIVKEY_DEINIT) (gnutls_openpgp_privkey_t);
+
diff --git a/libextra/openpgp/gnutls_openpgp.h b/libextra/openpgp/gnutls_openpgp.h
index 009a7de96d..4feebdfd24 100644
--- a/libextra/openpgp/gnutls_openpgp.h
+++ b/libextra/openpgp/gnutls_openpgp.h
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#ifdef USE_OPENPGP
+#ifdef ENABLE_OPENPGP
 
 #ifndef GNUTLS_OPENPGP_H
 #define GNUTLS_OPENPGP_H
@@ -85,6 +85,6 @@ time_t _gnutls_openpgp_get_raw_key_creation_time(const gnutls_datum_t *
 time_t _gnutls_openpgp_get_raw_key_expiration_time(const gnutls_datum_t *
 						   cert);
 
-#endif				/*GNUTLS_OPENPGP_H */
+#endif	/*GNUTLS_OPENPGP_H */
 
-#endif				/*USE_OPENPGP */
+#endif	/*ENABLE_OPENPGP */
diff --git a/libextra/openpgp/openpgp.h b/libextra/openpgp/openpgp.h
index 2ff8c1eb4c..4f9fa50684 100644
--- a/libextra/openpgp/openpgp.h
+++ b/libextra/openpgp/openpgp.h
@@ -7,10 +7,9 @@ typedef enum gnutls_openpgp_key_fmt_t {
     GNUTLS_OPENPGP_FMT_RAW, GNUTLS_OPENPGP_FMT_BASE64
 } gnutls_openpgp_key_fmt_t;
 
-#ifdef USE_OPENPGP
+#ifdef ENABLE_OPENPGP
 
-
-#include <opencdk.h>
+# include <opencdk.h>
 
 typedef struct gnutls_openpgp_key_int {
     cdk_kbnode_t knode;
@@ -95,11 +94,11 @@ void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey_t key);
 
 #else				/* no opencdk */
 
-typedef void *gnutls_openpgp_key;
-typedef void *gnutls_openpgp_privkey;
-typedef void *gnutls_openpgp_keyring;
-typedef void *gnutls_openpgp_trustdb;
+typedef void *gnutls_openpgp_key_t;
+typedef void *gnutls_openpgp_privkey_t;
+typedef void *gnutls_openpgp_keyring_t;
+typedef void *gnutls_openpgp_trustdb_t;
 
-#endif				/* USE_OPENPGP */
+#endif /* ENABLE_OPENPGP */
 
-#endif				/* OPENPGP_H */
+#endif /* OPENPGP_H */