From: Tom Yu <tlyu@mit.edu>
Date: Mon, 8 Jul 2002 17:22:24 +0000 (+0000)
Subject: 	* et_c.awk: Fix up <com_err.h> inclusion for windows and mac
X-Git-Tag: krb5-1.3-alpha1~605
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b3ec0d3e5f2b0b0e379e0a6e51c6e4e4d109b93;p=krb5.git

	* 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 4b767f953..14376b76e 100644
--- 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 10662b6e5..0305bafc2 100644
--- 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 fff4a56ff..b512252c6 100644
--- 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) &&