From b53c4fe3f92e3d2c5bd9fca1a171cd24f66ef14d Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 4 Mar 2019 15:53:58 -0500 Subject: [PATCH] util/mkerr.pl: Add an inclusion of symhacks.h in all error files This does no harm, and ensures that the inclusion isn't mistakenly removed in the generated *err.h where it's actually needed. Reviewed-by: Nicola Tuveri Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/8397) --- include/openssl/cryptoerr.h | 2 -- util/mkerr.pl | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h index 2f3df746d2..e757b0e150 100644 --- a/include/openssl/cryptoerr.h +++ b/include/openssl/cryptoerr.h @@ -15,8 +15,6 @@ extern "C" # endif -# include - int ERR_load_CRYPTO_strings(void); /* diff --git a/util/mkerr.pl b/util/mkerr.pl index cf100d1210..7139ee3bea 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -417,9 +417,7 @@ print STDERR "\n" if $debug; &phase("Writing files"); my $newstate = 0; foreach my $lib ( keys %errorfile ) { - if ( ! $fnew{$lib} && ! $rnew{$lib} ) { - next unless $rebuild; - } + next if ! $fnew{$lib} && ! $rnew{$lib} && ! $rebuild; next if scalar keys %modules > 0 && !$modules{$lib}; next if $nowrite; print STDERR "$lib: $fnew{$lib} new functions\n" if $fnew{$lib}; @@ -455,6 +453,10 @@ foreach my $lib ( keys %errorfile ) { #ifndef HEADER_${lib}ERR_H # define HEADER_${lib}ERR_H +# ifndef HEADER_SYMHACKS_H +# include +# endif + EOF if ( $internal ) { # Declare the load function because the generate C file -- 2.25.1