diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-12-01 23:55:54 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-12-01 23:55:54 +0000 |
| commit | 1e9d8f6a117566cd723b274ea2e8b1ce24108f09 (patch) | |
| tree | 7ac516b0eb0ed3ca62ec65c841fe6fee5c9cd101 /src | |
| parent | 3fa462ad4c88037b138aae6088c7ccee7b2c4663 (diff) | |
| download | krb5-1e9d8f6a117566cd723b274ea2e8b1ce24108f09.tar.gz krb5-1e9d8f6a117566cd723b274ea2e8b1ce24108f09.tar.xz krb5-1e9d8f6a117566cd723b274ea2e8b1ce24108f09.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/et/ChangeLog | 5 | ||||
| -rw-r--r-- | src/util/et/Makefile.in | 2 | ||||
| -rw-r--r-- | src/util/et/com_err.h | 10 | ||||
| -rw-r--r-- | src/util/et/error_table.h | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index cd7eec4b8..8c05dcca3 100644 --- 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 11dc325a5..805c694e9 100644 --- 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 50f941326..60b209d0d 100644 --- 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 053a52174..02c8d4a4e 100644 --- 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 |