From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 6 Dec 2000 09:01:33 +0000 (+0000)
Subject: restore GSS_DLLIMP, KRB5_EXPORTVAR, NEAR macros
X-Git-Tag: krb5-1.3-alpha1~1740
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c432d6933d55d1c04923fc8eacf17957db2b049f;p=krb5.git

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 69d8547b9..3bfd7b5b4 100644
--- 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 1ec2be1b6..dca104b13 100644
--- 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>