Restore -DTERMIO/-DTERMIOS on Windows platforms.

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 15b774f27728b5006aa1504391b5cc7b191b4066..2438e8eb0c31d276bcf8cc0eefb85921096f9e84 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -14,6 +14,7 @@ my $pack_errcode;
 my $load_errcode;
 
 my $errcount;
+my $year = (localtime)[5] + 1900;
 
 while (@ARGV) {
        my $arg = $ARGV[0];
@@ -115,7 +116,7 @@ EOF
 }
 
 if($recurse) {
-       @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
+       @source = ( <crypto/*.c>, <crypto/*/*.c>, <ssl/*.c> )
 } else {
        @source = @ARGV;
 }
@@ -250,7 +251,7 @@ while (($hdr, $lib) = each %libinc)
 
        if ($gotfile) {
          while(<IN>) {
-               if(/^\#define\s+(\S+)\s+(\S+)/) {
+               if(/^\#\s*define\s+(\S+)\s+(\S+)/) {
                        $name = $1;
                        $code = $2;
                        next if $name =~ /^${lib}err/;
@@ -391,7 +392,7 @@ foreach $lib (keys %csrc)
        } else {
            push @out,
 "/* ====================================================================\n",
-" * Copyright (c) 2001-2010 The OpenSSL Project.  All rights reserved.\n",
+" * Copyright (c) 2001-$year The OpenSSL Project.  All rights reserved.\n",
 " *\n",
 " * Redistribution and use in source and binary forms, with or without\n",
 " * modification, are permitted provided that the following conditions\n",
@@ -576,7 +577,7 @@ EOF
        print OUT <<"EOF";
 /* $cfile */
 /* ====================================================================
- * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-$year The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -769,7 +770,7 @@ EOF
        undef %err_reason_strings;
 }
 
-if($debug && defined(%notrans)) {
+if($debug && %notrans) {
        print STDERR "The following function codes were not translated:\n";
        foreach(sort keys %notrans)
        {
@@ -787,7 +788,7 @@ foreach (keys %rcodes) {
        push (@runref, $_) unless exists $urcodes{$_};
 }
 
-if($debug && defined(@funref) ) {
+if($debug && @funref) {
        print STDERR "The following function codes were not referenced:\n";
        foreach(sort @funref)
        {
@@ -795,7 +796,7 @@ if($debug && defined(@funref) ) {
        }
 }
 
-if($debug && defined(@runref) ) {
+if($debug && @runref) {
        print STDERR "The following reason codes were not referenced:\n";
        foreach(sort @runref)
        {