diff options
| -rw-r--r-- | src/util/et/ChangeLog | 5 | ||||
| -rw-r--r-- | src/util/et/com_err.h | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index 086fad587..e886e3a88 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 18 15:07:40 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * com_err.h: Add 'extern "C"' for C++ compatibility; also check for + __cplusplus since some C++ compilers don't set __STDC__ + Mon Mar 3 14:57:35 1997 Ezra Peisach <epeisach@mit.edu> * error_message.c: Don't declare sys_nerr on Macintosh. diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h index b425c8023..26c673b6f 100644 --- a/src/util/et/com_err.h +++ b/src/util/et/com_err.h @@ -36,7 +36,7 @@ #define NEAR #endif -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) +#if defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) /* End-user programs may need this -- oh well */ #ifndef HAVE_STDARG_H @@ -68,6 +68,10 @@ struct error_table { unsigned int n_msgs; }; +#ifdef __cplusplus +#extern "C" { +#endif + KRB5_DLLIMP extern void KRB5_CALLCONV_C com_err ET_STDARG_P((const char FAR *, errcode_t, const char FAR *, ...)); KRB5_DLLIMP extern void KRB5_CALLCONV com_err_va @@ -93,5 +97,9 @@ extern et_old_error_hook_func reset_com_err_hook ET_P((void)); #endif +#ifdef __cplusplus +} +#endif + #define __COM_ERR_H #endif /* ! defined(__COM_ERR_H) */ |