diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:58:12 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:58:12 +0200 |
commit | fbbfd128c9aa884216ace8c63be9071b3b690bee (patch) | |
tree | 8e898384b78a7bb26dcaba572eba6c4579e6e569 /test/ossl_shim | |
parent | b5acbf914833a83368e51766de4cf2e2074a9436 (diff) |
Fix header file include guard names
Make the include guards consistent by renaming them systematically according
to the naming conventions below
The public header files (in the 'include/openssl' directory) are not changed
in 1.1.1, because it is a stable release.
For the private header files files, the guard names try to match the path
specified in the include directives, with all letters converted to upper case
and '/' and '.' replaced by '_'. An extra 'OSSL_' is added as prefix.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9681)
Diffstat (limited to 'test/ossl_shim')
-rw-r--r-- | test/ossl_shim/async_bio.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/include/openssl/base.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/packeted_bio.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/test_config.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/test/ossl_shim/async_bio.h b/test/ossl_shim/async_bio.h index bb24eadbbf..c09e236aef 100644 --- a/test/ossl_shim/async_bio.h +++ b/test/ossl_shim/async_bio.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_ASYNC_BIO -#define HEADER_ASYNC_BIO +#ifndef OSSL_TEST_SHIM_ASYNC_BIO_H +#define OSSL_TEST_SHIM_ASYNC_BIO_H #include <openssl/base.h> #include <openssl/bio.h> @@ -36,4 +36,4 @@ void AsyncBioAllowWrite(BIO *bio, size_t count); void AsyncBioEnforceWriteQuota(BIO *bio, bool enforce); -#endif // HEADER_ASYNC_BIO +#endif // OSSL_TEST_SHIM_ASYNC_BIO_H diff --git a/test/ossl_shim/include/openssl/base.h b/test/ossl_shim/include/openssl/base.h index f725cd9d45..a8d47b86ae 100644 --- a/test/ossl_shim/include/openssl/base.h +++ b/test/ossl_shim/include/openssl/base.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef OPENSSL_HEADER_BASE_H -#define OPENSSL_HEADER_BASE_H +#ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H +#define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H /* Needed for BORINGSSL_MAKE_DELETER */ # include <openssl/bio.h> @@ -108,4 +108,4 @@ BORINGSSL_MAKE_DELETER(SSL_SESSION, SSL_SESSION_free) } /* extern C++ */ -#endif /* OPENSSL_HEADER_BASE_H */ +#endif /* OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H */ diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h index 436cf9082f..895bd37952 100644 --- a/test/ossl_shim/packeted_bio.h +++ b/test/ossl_shim/packeted_bio.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PACKETED_BIO -#define HEADER_PACKETED_BIO +#ifndef OSSL_TEST_SHIM_PACKETED_BIO_H +#define OSSL_TEST_SHIM_PACKETED_BIO_H #include <openssl/base.h> #include <openssl/bio.h> @@ -32,4 +32,4 @@ timeval PacketedBioGetClock(const BIO *bio); bool PacketedBioAdvanceClock(BIO *bio); -#endif // HEADER_PACKETED_BIO +#endif // OSSL_TEST_SHIM_PACKETED_BIO_H diff --git a/test/ossl_shim/test_config.h b/test/ossl_shim/test_config.h index b4efa455ae..f95475a42e 100644 --- a/test/ossl_shim/test_config.h +++ b/test/ossl_shim/test_config.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_TEST_CONFIG -#define HEADER_TEST_CONFIG +#ifndef OSSL_TEST_SHIM_TEST_CONFIG_H +#define OSSL_TEST_SHIM_TEST_CONFIG_H #include <string> #include <vector> @@ -85,4 +85,4 @@ struct TestConfig { bool ParseConfig(int argc, char **argv, TestConfig *out_config); -#endif // HEADER_TEST_CONFIG +#endif // OSSL_TEST_SHIM_TEST_CONFIG_H |