Commit b53c4fe3 authored by Rich Salz's avatar Rich Salz Committed by Richard Levitte
Browse files

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: default avatarNicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8397)
parent 4d768e96

include/openssl/cryptoerr.h

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
extern "C"

# endif



# include <openssl/symhacks.h>



int ERR_load_CRYPTO_strings(void);



/*

util/mkerr.pl

+5 −3
Original line number Diff line number Diff line
@@ -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