diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-03-04 15:53:58 -0500 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-07-02 10:06:15 +0200 |
| commit | dfaaf47a1acddc0b2832b3fe2a211444a5e746ae (patch) | |
| tree | f19f79a57e1c57b8907c85b117334c8c70a43868 /util | |
| parent | 26675d1cf407fb7ba248c04767eccda56b06263f (diff) | |
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 <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit b53c4fe3f92e3d2c5bd9fca1a171cd24f66ef14d)
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9281)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mkerr.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl index 0ea02961a5..c4a2f8f00e 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 <openssl/symhacks.h> +# endif + EOF if ( $internal ) { # Declare the load function because the generate C file |