summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2019-03-04 21:53:58 +0100
committerRichard Levitte <levitte@openssl.org>2019-03-11 14:42:47 +0100
commitb53c4fe3f92e3d2c5bd9fca1a171cd24f66ef14d (patch)
tree2b62976fef97f4e538ae5c8633b64d2c1661010a /util
parentopenssl app for macs that uses the new EVP_MAC interface (the code inside dgs... (diff)
downloadopenssl-b53c4fe3f92e3d2c5bd9fca1a171cd24f66ef14d.tar.xz
openssl-b53c4fe3f92e3d2c5bd9fca1a171cd24f66ef14d.zip
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> (Merged from https://github.com/openssl/openssl/pull/8397)
Diffstat (limited to 'util')
-rwxr-xr-xutil/mkerr.pl8
1 files changed, 5 insertions, 3 deletions
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 <openssl/symhacks.h>
+# endif
+
EOF
if ( $internal ) {
# Declare the load function because the generate C file