Apply the following changes from the main trunk:

2001-03-08 13:14  bodo

	* util/mkerr.pl (1.14): Change mkerr.pl so that it puts the
	ERR_load_..._strings() prototype in header files that it writes.

2001-05-10 02:07  steve

	* util/mkerr.pl (1.15): Fix to allow multiple NONE libraries in
	mkerr.pl .

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7d98b5234d91026c31cbebc9e784ceaeec5f8c3a..f833bfe87a1a71adf8f2cd1f8d09599aa479a718 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -53,6 +53,7 @@ while(<IN>)
 {
        if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
                $hinc{$1} = $2;
+               $libinc{$2} = $1;
                $cskip{$3} = $1;
                if($3 ne "NONE") {
                        $csrc{$1} = $3;
@@ -74,7 +75,7 @@ close IN;
 # Scan each header file in turn and make a list of error codes
 # and function names
 
-while (($lib, $hdr) = each %hinc)
+while (($hdr, $lib) = each %libinc)
 {
        next if($hdr eq "NONE");
        print STDERR "Scanning header file $hdr\n" if $debug; 
@@ -257,6 +258,7 @@ foreach $lib (keys %csrc)
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_${lib}_strings(void);
 
 /* Error codes for the $lib functions. */
 
@@ -288,7 +290,6 @@ EOF
 }
 #endif
 #endif
-
 EOF
        close OUT;