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)

diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 10723d0454b3c558f3f8a4f10fc50d6ea67eae9f..66cbf5b300ab9cbc589efde2d42aade6fd838ed0 100644 (file)
--- 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
index 0ea02961a5fdea9bb0427eacd97a4035e97f623a..c4a2f8f00e020048abf31b9c825783d6dafdc3fc 100755 (executable)
--- 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