* et_c.awk: Fix up <com_err.h> inclusion for windows and mac

	* et_c.pl: Regenerate.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14614 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 4b767f953cbe2e843c0c776a26ae6f032ad7afa4..14376b76e4a41ce4914d6a061569bcfc33ada6db 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-08  Tom Yu  <tlyu@mit.edu>
+
+       * et_c.awk: Fix up <com_err.h> inclusion for windows and mac.
+
+       * et_c.pl: Regenerate.
+
 2002-07-03  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Fix rebuild rules et_?.perl -> et_?.pl.  Also,

diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk
index 10662b6e508e772c1f00b2b4244ed9c5219a6584..0305bafc2204359f5942cccac79c4c627651b6da 100644 (file)
--- a/src/util/et/et_c.awk
+++ b/src/util/et/et_c.awk
@@ -187,9 +187,11 @@ END {
        print "    0" > outfile
        print "};" > outfile
        print "" > outfile
-       print "#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))" > outfile
+        print "#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))" > outfile
+        print "#include <KerberosComErr/KerberosComErr.h>" > outfile
+        print "#else" > outfile
        print "#include <com_err.h>" > outfile
-       print "#endif" > outfile
+        print "#endif" > outfile
        print "" > outfile
        if (tab_base_high == 0) {
            print "const struct error_table et_" table_name "_error_table = { text, " \

diff --git a/src/util/et/et_c.pl b/src/util/et/et_c.pl
index fff4a56ffaf9501c5d04972b6162aef3713cd61e..b512252c6b3d52bb5e2d7473494d9a48c8bd4946 100644 (file)
--- a/src/util/et/et_c.pl
+++ b/src/util/et/et_c.pl
@@ -241,7 +241,11 @@ line: while (<>) {
 &Pick('>', $outfile) &&
     (print $fh
 
-      '#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))');
+      '#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))');
+&Pick('>', $outfile) &&
+    (print $fh '#include <KerberosComErr/KerberosComErr.h>');
+&Pick('>', $outfile) &&
+    (print $fh '#else');
 &Pick('>', $outfile) &&
     (print $fh '#include <com_err.h>');
 &Pick('>', $outfile) &&