Fix broken Windows 16 declaration. (Should be KRB5_CALLCONV, and

using ET_P)

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

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index ed1f46de57c431e28042acbe7b8983cd8201608c..66daf0747de4d7d410dad12b17ee0152c886f933 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 10 21:30:41 1997  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * com_err.c, com_err.h (com_err_va): Fix broken Windows 16
+               declaration.  (Should be KRB5_CALLCONV, and using ET_P)
+
 Fri Feb  7 22:10:23 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * compile_et.c: Change the emitted name of the struct error_table

diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index 49aa2965873ef9fd56cab43648953d9dbc081caf..2b1d10078d885e349be3d087e6724cf7c49a7dee 100644 (file)
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -154,7 +154,7 @@ KRB5_DLLIMP void KRB5_CALLCONV_C et_com_err(ectx, whoami,
 /*
  * The following are the old-style com_err interfaces....
  */
-KRB5_DLLIMP void KRB5_CALLCONV_C com_err_va(whoami, code, fmt, args)
+KRB5_DLLIMP void KRB5_CALLCONV com_err_va(whoami, code, fmt, args)
     const char FAR * whoami;
     errcode_t code;
     const char FAR * fmt;

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 435dd4d1099fbb6be65a48eeda1a3b5c4c4d6541..7a5c9d991ab0084681d2dc7d43b3e214a8479422 100644 (file)
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -61,8 +61,6 @@ typedef void (*et_old_error_hook_func) ET_P((const char FAR *, errcode_t,
        
 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_C com_err_va
-       ET_STDARG_P((const char FAR *, errcode_t, const char FAR *, va_list));
 
 KRB5_DLLIMP extern const char FAR * KRB5_CALLCONV error_message
        ET_P((errcode_t));