I really did mean #ifdef unix... I added AIX for compatibility.

Basically, only old Unix comerr will have the backwards compatibility.
New systems, such as MVS/OpenEdition, MacOS, VMS, etc. should NOT.

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

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index aebe1bb68bc03a83645894f0d2b0e76ce54628b0..c2f5478d21164f5a970a9cfee661081c5b4ac9f7 100644 (file)
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -16,6 +16,10 @@
  * programs are not including that file. We probably want to
  * come up with a better way of handling this problem.
  */
+#if defined(_AIX) && !defined(unix)
+#define unix
+#endif
+
 #if defined(_MSDOS) || defined (_WIN32)
 #include <win-mac.h>
 #endif
@@ -76,7 +80,7 @@ KRB5_DLLIMP extern errcode_t KRB5_CALLCONV add_error_table
 KRB5_DLLIMP extern errcode_t KRB5_CALLCONV remove_error_table
        ET_P((const struct error_table FAR *));
 
-#if !(defined(_MSDOS)||defined(_WIN32))
+#ifdef unix
 /*
  * The display routine should be application specific.  A global hook,
  * may cause inappropriate display procedures to be called between

diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
index c20e1d0a9f8c379fe555132a4983591729b3b6c7..7ffe1b67a2e5c86e94524a8f882d4149c11c1fd0 100644 (file)
--- a/src/util/et/error_message.c
+++ b/src/util/et/error_message.c
@@ -39,7 +39,7 @@ extern const int sys_nerr;
 
 static char buffer[ET_EBUFSIZ];
 
-#if defined(_MSDOS)||defined(_WIN32)
+#if !defined(unix) && !defined(_AIX)
 static struct et_list * _et_list = (struct et_list *) NULL;
 #else
 /* Old interface compatibility */

diff --git a/src/util/et/et_h.awk b/src/util/et/et_h.awk
index 3f0639db9287d60df2cab022dc796bd7b26c4272..8f23d3411acfd3824b00b3a4656be7dd963d60ee 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 struct error_table et_" table_name "_error_table;" > outfile
        print "" > outfile
-       print "#if !(defined(_MSDOS)||defined(_WIN32))" > outfile
+       print "#if defined(unix) || defined(_AIX)" > outfile
        print "/* for compatibility with older versions... */" > outfile
        print "extern void initialize_" table_name "_error_table ();" > outfile
        print "#define init_" table_name "_err_tbl initialize_" table_name "_error_table" > outfile