com_err.h, error_table.h: Use "#if defined(MSDOS) || ..." instead of

	"#if !defined(unix)", since not all Unix compilers define "unix".

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

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index cd7eec4b887207f55387f992fd53dc601d2a4bd1..8c05dcca3de9582248f39fb32903e2e0106d6146 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,7 +1,8 @@
 1998-12-01  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
-       * error_message.c: Use "#if defined(MSDOS) || ..." instead of 
-               "#if !defined(unix)", since not all Unix compilers define
+       * com_err.h, error_table.h, error_message.c: Use "#if
+               defined(MSDOS) || ..." instead of "#if
+               !defined(unix)", since not all Unix compilers define
                "unix".
 
 1998-07-02  Theodore Ts'o  <tytso@rsts-11.mit.edu>

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 11dc325a5ce9d32284439b854ee1d32239b21b4f..805c694e94f7f3a6b8ad77bdfa8baab2dc18db5a 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -1,4 +1,6 @@
 thisconfigdir=.
+myfulldir=util/et
+mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 RELDIR=../util/et
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 50f94132634d677a8dc24019fbf8adbb6067829f..60b209d0de33e9f445d2a79849b1a8ca751c059d 100644 (file)
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -12,14 +12,6 @@
 
 #ifndef __COM_ERR_H
 
-/* This should be part of k5-config.h but many application
- * 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) || defined(macintosh)
 #include <win-mac.h>
 #if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
@@ -87,7 +79,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 *));
 
-#ifdef unix
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
 /*
  * 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_table.h b/src/util/et/error_table.h
index 053a521745d0b36475f3880bf0fd73339bb4a6c2..02c8d4a4e127bb6461406c9c3a69608e2e382a69 100644 (file)
--- a/src/util/et/error_table.h
+++ b/src/util/et/error_table.h
@@ -16,7 +16,7 @@ struct et_list {
     const struct error_table FAR *table;
 };
 
-#if defined(unix) || defined(_AIX)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
 extern struct et_list * _et_list;
 #endif