Add or clean header guards in lib/includes/gnutls/

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

diff --git a/configure.ac b/configure.ac
index 8ad597bfd3aec0839345ee2b297f897d97e8e72a..e5536e5a1276b9254e11c89f36a46956570cab38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -932,7 +932,6 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
 
 AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes")
 
-AC_DEFINE([GNUTLS_COMPAT_H], 1, [Make sure we don't use old features in code.])
 AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of deprecated functions - until they are removed.])
 
 AC_DEFINE([fread_file], [_gnutls_fread_file], [static lib rename])

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index d4b7da68b2f86af6d3b21cd1751f19b3d8e8c5bb..b06e0406ae6260480531e79535301cdbbf9a68ca 100644 (file)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __GNUTLS_ABSTRACT_H
-#define __GNUTLS_ABSTRACT_H
+#ifndef GNUTLS_ABSTRACT_H
+#define GNUTLS_ABSTRACT_H
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -768,4 +768,5 @@ gnutls_pubkey_print(gnutls_pubkey_t pubkey,
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_ABSTRACT_H */

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index b2ebcb4075e0504a20f752a19488cfadc638b210..2779ca9f3a512205902c7a4965fc2280084855d0 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -22,8 +22,8 @@
 
 /* Typedefs for more compatibility with older GnuTLS. */
 
-#ifndef _GNUTLS_COMPAT_H
-#define _GNUTLS_COMPAT_H
+#ifndef GNUTLS_COMPAT_H
+#define GNUTLS_COMPAT_H
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
@@ -243,4 +243,4 @@ int gnutls_priority_compression_list(gnutls_priority_t pcache,
 #endif
 /* *INDENT-ON* */
 
-#endif                         /* _GNUTLS_COMPAT_H */
+#endif /* GNUTLS_COMPAT_H */

diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 4f70b4a56873c85c3bbcb66272246e28a47843cd..43a0e60c0f678a2d6c3a6e2f5b6353bbca223741 100644 (file)
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -256,4 +256,5 @@ int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_CRYPTO_H */

diff --git a/lib/includes/gnutls/dtls.h b/lib/includes/gnutls/dtls.h
index 7e7133e6ae17a27c12f55ad776394fba43ce8a5f..972ec0a34c62d43a5e2f1c6864faa271a8becd41 100644 (file)
--- a/lib/includes/gnutls/dtls.h
+++ b/lib/includes/gnutls/dtls.h
@@ -89,4 +89,5 @@ unsigned int gnutls_record_get_discarded(gnutls_session_t session);
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_DTLS_H */
+
+#endif /* GNUTLS_DTLS_H */

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 08012031288761945453abb4c8a48715eccde559..e99b42b475667d64781e05a81d8d6a6504b817b5 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -33,9 +33,8 @@
  * The low level cipher functionality is in gnutls/crypto.h.
  */
 
-
-#ifndef GNUTLS_H
-#define GNUTLS_H
+#ifndef GNUTLS_GNUTLS_H
+#define GNUTLS_GNUTLS_H
 
 /* Get ssize_t. */
 #include <sys/types.h>
@@ -3354,4 +3353,4 @@ void gnutls_fips140_set_mode(gnutls_fips_mode_t mode, unsigned flags);
 
 #include <gnutls/compat.h>
 
-#endif                         /* GNUTLS_H */
+#endif /* GNUTLS_GNUTLS_H */

diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index 6140550789db2c688eac4c396a25f047a7e8be89..eeefb798a398474e205b47d0b9c41d8d81fe3089 100644 (file)
--- a/lib/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GNUTLSXX_H
-#define GNUTLSXX_H
+#ifndef GNUTLS_GNUTLSXX_H
+#define GNUTLS_GNUTLSXX_H
 
 #include <exception>
 #include <vector>
@@ -428,4 +428,4 @@ namespace gnutls {
 
 }                              /* namespace */
 
-#endif                         /* GNUTLSXX_H */
+#endif /* GNUTLS_GNUTLSXX_H */

diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index 98a06cc29e9793e1a21891d1bf6bc8d13af4de76..e699b231a88d830062b1ee6ea863d2db613a49a3 100644 (file)
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -283,4 +283,5 @@ gnutls_ocsp_resp_list_import2(gnutls_ocsp_resp_t **ocsps,
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_OCSP_H */
+
+#endif /* GNUTLS_OCSP_H */

diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 01d01fdada48958d980e0bdb6ef8b8bcd3eb591a..632ffb1dc018c56d1859c81e56ad2a24325e8995 100644 (file)
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -377,4 +377,5 @@ int gnutls_certificate_set_openpgp_keyring_file
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_OPENPGP_H */
+
+#endif /* GNUTLS_OPENPGP_H */

diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 0c3d22be947ad332a2343563b02c3bd37513c358..351ddd1cd8b6314ac5bb5a914f7e3e3111977a79 100644 (file)
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __GNUTLS_PKCS11_H
-#define __GNUTLS_PKCS11_H
+#ifndef GNUTLS_PKCS11_H
+#define GNUTLS_PKCS11_H
 
 #include <stdarg.h>
 #include <gnutls/gnutls.h>
@@ -510,4 +510,5 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_PKCS11_H */

diff --git a/lib/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index 66308c9d882111d08258af47fd7e5f77dc83d24f..e613fe12f58d8d5baabdde7baf12bcafd4197579 100644 (file)
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -145,4 +145,5 @@ int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag,
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_PKCS12_H */
+
+#endif /* GNUTLS_PKCS12_H */

diff --git a/lib/includes/gnutls/pkcs7.h b/lib/includes/gnutls/pkcs7.h
index 8a6c2034f01608766096337778a0462bfb600738..b2fa32e115861bac646031604613a7148c3abcd5 100644 (file)
--- a/lib/includes/gnutls/pkcs7.h
+++ b/lib/includes/gnutls/pkcs7.h
@@ -149,4 +149,5 @@ int gnutls_pkcs7_print(gnutls_pkcs7_t pkcs7,
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_PKCS7_H */
+
+#endif /* GNUTLS_PKCS7_H */

diff --git a/lib/includes/gnutls/self-test.h b/lib/includes/gnutls/self-test.h
index 8771749bf0e494c58f040546e0464fcdf2c71ac8..aacbe94ca6beeb34bf30d5799a7d84b8cf87ce69 100644 (file)
--- a/lib/includes/gnutls/self-test.h
+++ b/lib/includes/gnutls/self-test.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __GNUTLS_SELF_H
-#define __GNUTLS_SELF_H
+#ifndef GNUTLS_SELF_TEST_H
+#define GNUTLS_SELF_TEST_H
 
 #include <gnutls/gnutls.h>
 
@@ -35,4 +35,4 @@ int gnutls_mac_self_test(unsigned flags, gnutls_mac_algorithm_t mac);
 int gnutls_digest_self_test(unsigned flags, gnutls_digest_algorithm_t digest);
 int gnutls_pk_self_test(unsigned flags, gnutls_pk_algorithm_t pk);
 
-#endif
+#endif /* GNUTLS_SELF_TEST_H */

diff --git a/lib/includes/gnutls/socket.h b/lib/includes/gnutls/socket.h
index 03c5cef7b7187e65cc2423a42ad49005308e472a..64eb19f896e7b9fc556eb695acacf640b2ccdd73 100644 (file)
--- a/lib/includes/gnutls/socket.h
+++ b/lib/includes/gnutls/socket.h
@@ -48,4 +48,5 @@ void gnutls_transport_set_fastopen(gnutls_session_t session,
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_SOCKET_H */
+
+#endif /* GNUTLS_SOCKET_H */

diff --git a/lib/includes/gnutls/system-keys.h b/lib/includes/gnutls/system-keys.h
index 68b8a20b4abc31fe0503bb69a603a84cc98f9f23..a0aa056dfa648da1c67b43a426eb31dda6d217e3 100644 (file)
--- a/lib/includes/gnutls/system-keys.h
+++ b/lib/includes/gnutls/system-keys.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __GNUTLS_SYSTEM_KEYS_H
-#define __GNUTLS_SYSTEM_KEYS_H
+#ifndef GNUTLS_SYSTEM_KEYS_H
+#define GNUTLS_SYSTEM_KEYS_H
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -60,4 +60,5 @@ int gnutls_system_key_add_x509(gnutls_x509_crt_t crt, gnutls_x509_privkey_t priv
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_SYSTEM_KEYS_H */

diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index 82503c648ef7da0673f66c7275b8d2f7d8d10f9a..b5da3e994fca5a31ab76f585948c26b379b49afe 100644 (file)
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __GNUTLS_TPM_H
-#define __GNUTLS_TPM_H
+#ifndef GNUTLS_TPM_H
+#define GNUTLS_TPM_H
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -76,4 +76,5 @@ int gnutls_tpm_privkey_delete(const char *url, const char *srk_password);
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_TPM_H */

diff --git a/lib/includes/gnutls/urls.h b/lib/includes/gnutls/urls.h
index 6f67c251b4345be3760ece16c3532d3a5be70850..f4fd5a79156169370892daf29049143833d43895 100644 (file)
--- a/lib/includes/gnutls/urls.h
+++ b/lib/includes/gnutls/urls.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __GNUTLS_URLS_H
-#define __GNUTLS_URLS_H
+#ifndef GNUTLS_URLS_H
+#define GNUTLS_URLS_H
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -74,4 +74,5 @@ int gnutls_register_custom_url(const gnutls_custom_url_st *st);
 }
 #endif
 /* *INDENT-ON* */
-#endif
+
+#endif /* GNUTLS_URLS_H */

diff --git a/lib/includes/gnutls/x509-ext.h b/lib/includes/gnutls/x509-ext.h
index 170d02a48b2d632056139fc23caef3441f51f79c..b288c31a19d629da005e1eff0bc8e511aee25745 100644 (file)
--- a/lib/includes/gnutls/x509-ext.h
+++ b/lib/includes/gnutls/x509-ext.h
@@ -204,4 +204,5 @@ int gnutls_x509_tlsfeatures_add(gnutls_x509_tlsfeatures_t f, unsigned int featur
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_X509_H */
+
+#endif /* GNUTLS_X509_EXT_H */

diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index a153f7fac98390c264310f2656ae90981eae3df6..671f356e7b3e2d2908a39d4ff271aa8edbe09432 100644 (file)
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -1717,4 +1717,5 @@ gnutls_x509_ext_print(gnutls_x509_ext_st *exts, unsigned int exts_size,
 }
 #endif
 /* *INDENT-ON* */
-#endif                         /* GNUTLS_X509_H */
+
+#endif /* GNUTLS_X509_H */