diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-03 22:40:42 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-03 22:40:42 +0000 |
| commit | bc29722caef4b5866c6d60fb99eb79ff0758ea66 (patch) | |
| tree | 5a4fa4772fc2c7c855ae0481b7d2e6522693d6b2 /src/util/et/com_err.h | |
| parent | 1c307c6bd5e5a940d83cf4226bc10afe13983bcd (diff) | |
| download | krb5-bc29722caef4b5866c6d60fb99eb79ff0758ea66.tar.gz krb5-bc29722caef4b5866c6d60fb99eb79ff0758ea66.tar.xz krb5-bc29722caef4b5866c6d60fb99eb79ff0758ea66.zip | |
2002-07-03 Tom Yu <tlyu@mit.edu>
* Makefile.in: Fix rebuild rules et_?.perl -> et_?.pl. Also,
strip the "#!" line.
* error_table.h: Fix mac conditional, due to _et_list declaration
moving from et_c.awk
* et_c.perl, et_h.perl: Remove.
* et_c.pl, et_h.pl: Generate.
[porting some 1-2-2-branch changes]
* com_err.h: Windows should include <win-mac.h> as opposed
to <Kerberos5/win-mac.h>
* et_c.perl, et_h.perl:
Renamed to et_c.pl and et_h.pl because the extension is used
as a newline separator heuristic in MacPerl parser
* et_c.perl, et_h.perl:
Removed #! from the first line to avoid confusing MacPerl
* com_err.h, error_message.c, et.pbexp, et_c.awk, et_h.awk:
conditionalized com_err so it doesn't need to export et_list
on Mac OS X
[pullups from 1-2-2-branch]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14599 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/et/com_err.h')
| -rw-r--r-- | src/util/et/com_err.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h index c56fad2b1..8738a5a7f 100644 --- a/src/util/et/com_err.h +++ b/src/util/et/com_err.h @@ -13,7 +13,14 @@ #ifndef __COM_ERR_H #if defined(_WIN32) || defined(macintosh) +#ifdef _WIN32 #include <win-mac.h> +#else +#include <Kerberos5/win-mac.h> +#endif +#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import on +#endif #endif #ifndef KRB5_CALLCONV @@ -53,7 +60,7 @@ extern errcode_t KRB5_CALLCONV remove_error_table (const struct error_table *) /*@modifies internalState@*/; -#if !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) && !defined(__MACH__) /* * The display routine should be application specific. A global hook, * may cause inappropriate display procedures to be called between @@ -68,5 +75,9 @@ extern et_old_error_hook_func reset_com_err_hook (void); } #endif +#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import reset +#endif + #define __COM_ERR_H #endif /* ! defined(__COM_ERR_H) */ |