TLS/SSL and crypto library
Révision | 0490314f651bdd2888b7839f07c7591877e59bd5 (tree) |
---|---|
l'heure | 2020-09-13 19:11:57 |
Auteur | Richard Levitte <levitte@open...> |
Commiter | Matt Caswell |
Make 'make errors' work again
util/mkerr.pl detects if a header is now a '.in' template, and adjusts
the header file it reads accordingly.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12781)
@@ -263,7 +263,9 @@ while ( ( my $hdr, my $lib ) = each %libinc ) { | ||
263 | 263 | my $linenr = 0; |
264 | 264 | my $cpp = 0; |
265 | 265 | |
266 | - open(IN, "<$hdr") || die "Can't open $hdr, $!,"; | |
266 | + open(IN, "<$hdr") | |
267 | + || open(IN, "<$hdr.in") | |
268 | + || die "Can't open $hdr or $hdr.in, $!,"; | |
267 | 269 | while ( <IN> ) { |
268 | 270 | $linenr++; |
269 | 271 |
@@ -435,7 +437,6 @@ foreach my $lib ( keys %errorfile ) { | ||
435 | 437 | # Rewrite the header file |
436 | 438 | |
437 | 439 | my $hfile = $hinc{$lib}; |
438 | - $hfile =~ s/.h$/err.h/ if $internal; | |
439 | 440 | open( OUT, ">$hfile" ) || die "Can't write to $hfile, $!,"; |
440 | 441 | print OUT <<"EOF"; |
441 | 442 | /* |