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 <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (Merged from openssl#8397)
user-none · Mar 11, 2019 · b53c4fe · b53c4fe
1 parent 4d768e9
commit b53c4fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
@@ -15,8 +15,6 @@
 extern "C"
 # endif
 
-# include <openssl/symhacks.h>
-
 int ERR_load_CRYPTO_strings(void);
 
 /*

diff --git a/util/mkerr.pl b/util/mkerr.pl
@@ -417,9 +417,7 @@ sub help
 &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 @@ sub help
 #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
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,8 +15,6 @@ @@
     extern "C"
     # endif
-    # include <openssl/symhacks.h>
     int ERR_load_CRYPTO_strings(void);
     /*
@@ Expand Down @@