restore GSS_DLLIMP, KRB5_EXPORTVAR, NEAR macros

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

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 69d8547b974e3381f8ec645067a42a1be19bc891..3bfd7b5b41985ebd3563174f87633bee9ae588fd 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -8,8 +8,7 @@
        varargs.h support.
 
        * com_err.h: Get rid of old 68k-Mac pragmas.
-       (GSS_DLLIMP, KRB5_EXPORTVAR, HAVE_STDARG_H, ET_P, NEAR,
-       ET_STDARG_P, ET_VARARGS): Don't define.
+       (HAVE_STDARG_H, ET_P, ET_STDARG_P, ET_VARARGS): Don't define.
        (struct et_list, _et_list): Declare, with annotations.
        * error_table.h (struct et_list, _et_list): Don't declare here.
 

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 1ec2be1b630da8239fc6634b9bd7edf73e81941c..dca104b13188f52053988149fd96b83538efc214 100644 (file)
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -20,10 +20,17 @@
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_DLLIMP
+/* We don't use these, but since we're using the Kerberos ones, we
+   need to either provide all the ones the Kerberos and GSSAPI headers
+   will use, or not define KRB5_CALLCONV, since that's the only one
+   they test.  */
+#define GSS_DLLIMP
+#define KRB5_EXPORTVAR
 #endif
 
 #ifndef FAR
 #define FAR
+#define NEAR
 #endif
 
 #include <stdarg.h>