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 /engines | |
| 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 'engines')
| -rw-r--r-- | engines/e_afalg.h | 4 | ||||
| -rw-r--r-- | engines/e_afalg_err.h | 4 | ||||
| -rw-r--r-- | engines/e_capi_err.h | 4 | ||||
| -rw-r--r-- | engines/e_dasync_err.h | 4 | ||||
| -rw-r--r-- | engines/e_ossltest_err.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/engines/e_afalg.h b/engines/e_afalg.h index 2c03c448d6..3323c898c6 100644 --- a/engines/e_afalg.h +++ b/engines/e_afalg.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_AFALG_H -# define HEADER_AFALG_H +#ifndef OSSL_ENGINES_E_AFALG_H +# define OSSL_ENGINES_E_AFALG_H # if defined(__GNUC__) && __GNUC__ >= 4 && \ (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h index 3eb1332bbf..3036443f44 100644 --- a/engines/e_afalg_err.h +++ b/engines/e_afalg_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_AFALGERR_H -# define HEADER_AFALGERR_H +#ifndef OSSL_ENGINES_E_AFALG_ERR_H +# define OSSL_ENGINES_E_AFALG_ERR_H # define AFALGerr(f, r) ERR_AFALG_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h index e034c98cae..e3a927aa73 100644 --- a/engines/e_capi_err.h +++ b/engines/e_capi_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_CAPIERR_H -# define HEADER_CAPIERR_H +#ifndef OSSL_ENGINES_E_CAPI_ERR_H +# define OSSL_ENGINES_E_CAPI_ERR_H # define CAPIerr(f, r) ERR_CAPI_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h index 7c2c027879..5b74d8be25 100644 --- a/engines/e_dasync_err.h +++ b/engines/e_dasync_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DASYNCERR_H -# define HEADER_DASYNCERR_H +#ifndef OSSL_ENGINES_E_DASYNC_ERR_H +# define OSSL_ENGINES_E_DASYNC_ERR_H # define DASYNCerr(f, r) ERR_DASYNC_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h index e745c1a236..8e6535b76c 100644 --- a/engines/e_ossltest_err.h +++ b/engines/e_ossltest_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_OSSLTESTERR_H -# define HEADER_OSSLTESTERR_H +#ifndef OSSL_ENGINES_E_OSSLTEST_ERR_H +# define OSSL_ENGINES_E_OSSLTEST_ERR_H # define OSSLTESTerr(f, r) ERR_OSSLTEST_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) |