Removed Mac OS 9 support because it prevents darwin builds from getting com error...

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

diff --git a/src/util/et/error_table.h b/src/util/et/error_table.h
index 505521dfe54417516f33c9590e53c61ff1d33115..9e1d26fa5c825a8eb6e24505756cc8c2bfed24ca 100644 (file)
--- a/src/util/et/error_table.h
+++ b/src/util/et/error_table.h
@@ -9,17 +9,13 @@
 
 #include <errno.h>
 
-#if defined(macintosh)
-#define ET_EBUFSIZ 256
-#else
 #define ET_EBUFSIZ 64
-#endif
 
 struct et_list {
     /*@dependent@*//*@null@*/ struct et_list *next;
     /*@dependent@*//*@null@*/ const struct error_table *table;
 };
-#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))
+#if !defined(_WIN32)
 /*@null@*//*@dependent@*/ extern struct et_list * _et_list;
 #endif
 

diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk
index 04451366e4ea92102958a80791d8c1710b7f71d2..fc2e1ac53aa59298cf377a8ebe84bbe164ce02ae 100644 (file)
--- a/src/util/et/et_c.awk
+++ b/src/util/et/et_c.awk
@@ -113,7 +113,7 @@ c2n["_"]=63
        print "# include \"win-mac.h\"" > outfile
        print "#endif" > outfile
        print "" > outfile
-       print "#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))" > outfile
+       print "#if !defined(_WIN32)" > outfile
        print "extern void initialize_" table_name "_error_table (void);" > outfile
        print "#endif" > outfile
        print "" > outfile
@@ -199,7 +199,7 @@ END {
                tab_base_low, table_item_count) > outfile
        }
        print "" > outfile
-       print "#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))" > outfile
+       print "#if !defined(_WIN32)" > outfile
        print "void initialize_" table_name "_error_table (void)" > outfile
        print "    /*@modifies internalState@*/" > outfile
        print "{" > outfile

diff --git a/src/util/et/et_c.pl b/src/util/et/et_c.pl
index b512252c6b3d52bb5e2d7473494d9a48c8bd4946..f635bc1ac044cfcd5d7473dc8c6bbbaa94b9d1dc 100644 (file)
--- a/src/util/et/et_c.pl
+++ b/src/util/et/et_c.pl
@@ -146,7 +146,7 @@ line: while (<>) {
        &Pick('>', $outfile) &&
            (print $fh
 
-             '#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))');
+             '#if !defined(_WIN32)');
        &Pick('>', $outfile) &&
            (print $fh 'extern void initialize_' . $table_name .
 
@@ -238,18 +238,8 @@ line: while (<>) {
     (print $fh '};');
 &Pick('>', $outfile) &&
     (print $fh '');
-&Pick('>', $outfile) &&
-    (print $fh
-
-      '#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) &&
-    (print $fh '#endif');
 &Pick('>', $outfile) &&
     (print $fh '');
 if ($tab_base_high == 0) {
@@ -273,7 +263,7 @@ else {
 &Pick('>', $outfile) &&
     (print $fh
 
-      '#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))');
+      '#if !defined(_WIN32)');
 &Pick('>', $outfile) &&
     (print $fh 'void initialize_' . $table_name . '_error_table (void)');
 &Pick('>', $outfile) &&

diff --git a/src/util/et/et_h.awk b/src/util/et/et_h.awk
index 6bccc98e9713ad376b086b7a66c2c73f9ea74469..7a81dfa3f8afbb681636eb9bc3141f9d65468278 100644 (file)
--- a/src/util/et/et_h.awk
+++ b/src/util/et/et_h.awk
@@ -148,7 +148,7 @@ END {
        print "" > outfile
        print "extern const struct error_table et_" table_name "_error_table;" > outfile
        print "" > outfile
-       print "#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))" > outfile
+       print "#if !defined(_WIN32)" > outfile
        print "/* for compatibility with older versions... */" > outfile
        print "extern void initialize_" table_name "_error_table () /*@modifies internalState@*/;" > outfile
        print "#else" > outfile

diff --git a/src/util/et/et_h.pl b/src/util/et/et_h.pl
index 5debb486962ac4ccd0cac0c4b29b3d6b292f7d46..1105550989ebf740270022c3e94b7165c231b39a 100644 (file)
--- a/src/util/et/et_h.pl
+++ b/src/util/et/et_h.pl
@@ -136,18 +136,8 @@ line: while (<>) {
            (print $fh ' */');
        &Pick('>', $outfile) &&
            (print $fh '');
-       &Pick('>', $outfile) &&
-           (print $fh
-
-             '#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) &&
-           (print $fh '#endif');
        &Pick('>', $outfile) &&
            (print $fh '');
     }
@@ -203,7 +193,7 @@ else {
 &Pick('>', $outfile) &&
     (print $fh
 
-      '#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))');
+      '#if !defined(_WIN32)');
 &Pick('>', $outfile) &&
     (print $fh '/* for compatibility with older versions... */');
 &Pick('>', $outfile) &&