diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-12 10:36:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-24 15:22:33 +0100 |
| commit | 14a6c6a4e1eb8127514e6f5319701a1d7c3f5e82 (patch) | |
| tree | ac6257150d9944565e19644c7acf0f859458da57 /crypto/comp | |
| parent | Modify the ERR init functions to use the internal ERR string loaders (diff) | |
| download | openssl-14a6c6a4e1eb8127514e6f5319701a1d7c3f5e82.tar.xz openssl-14a6c6a4e1eb8127514e6f5319701a1d7c3f5e82.zip | |
ERR: Rebuild all generated error headers and source files
This is the result of 'make errors ERROR_REBUILD=-rebuild'
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13390)
Diffstat (limited to 'crypto/comp')
| -rw-r--r-- | crypto/comp/comp_err.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c index d4ae0406a3..972e75cdaf 100644 --- a/crypto/comp/comp_err.c +++ b/crypto/comp/comp_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,8 +10,11 @@ #include <openssl/err.h> #include <openssl/comperr.h> +#include "crypto/comperr.h" -#ifndef OPENSSL_NO_ERR +#ifndef OPENSSL_NO_COMP + +# ifndef OPENSSL_NO_ERR static const ERR_STRING_DATA COMP_str_reasons[] = { {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR), @@ -23,13 +26,16 @@ static const ERR_STRING_DATA COMP_str_reasons[] = { {0, NULL} }; -#endif +# endif -int ERR_load_COMP_strings(void) +int err_load_COMP_strings_int(void) { -#ifndef OPENSSL_NO_ERR +# ifndef OPENSSL_NO_ERR if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL) ERR_load_strings_const(COMP_str_reasons); -#endif +# endif return 1; } +#else +NON_EMPTY_TRANSLATION_UNIT +#endif |