diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:57 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:36 +0200 |
commit | ae4186b00487762f581b2276ba83e5214e0e7ee1 (patch) | |
tree | 78787c492eea42ddde78a9423aa1b507ffee162a /providers/common | |
parent | 8c78f0ec63f3e16bac1b888dbabf2b6c2d53a1ae (diff) |
Fix header file include guard names
Make the include guards consistent by renaming them systematically according
to the naming conventions below
For the public header files (in the 'include/openssl' directory), the guard
names try to match the path specified in the include directives, with
all letters converted to upper case and '/' and '.' replaced by '_'. For the
private header files files, an extra 'OSSL_' is added as prefix.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'providers/common')
-rw-r--r-- | providers/common/include/internal/digestcommon.h | 6 | ||||
-rw-r--r-- | providers/common/include/internal/providercommonerr.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/providers/common/include/internal/digestcommon.h b/providers/common/include/internal/digestcommon.h index 88caccf7cd..868cbbf79f 100644 --- a/providers/common/include/internal/digestcommon.h +++ b/providers/common/include/internal/digestcommon.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef OSSL_DIGESTCOMMON_H -# define OSSL_DIGESTCOMMON_H +#ifndef OSSL_PROVIDERS_DIGESTCOMMON_H +# define OSSL_PROVIDERS_DIGESTCOMMON_H # include <openssl/core_numbers.h> # include <openssl/core_names.h> @@ -100,4 +100,4 @@ int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz, } # endif -#endif /* OSSL_DIGESTCOMMON_H */ +#endif /* OSSL_PROVIDERS_DIGESTCOMMON_H */ diff --git a/providers/common/include/internal/providercommonerr.h b/providers/common/include/internal/providercommonerr.h index a9f79762b5..5ce5f32e7d 100644 --- a/providers/common/include/internal/providercommonerr.h +++ b/providers/common/include/internal/providercommonerr.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PROVERR_H -# define HEADER_PROVERR_H +#ifndef OSSL_PROVIDERS_PROVIDERCOMMONERR_H +# define OSSL_PROVIDERS_PROVIDERCOMMONERR_H # include <openssl/opensslconf.h> # include <openssl/symhacks.h> |