summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2000-12-06 09:01:33 +0000
committerKen Raeburn <raeburn@mit.edu>2000-12-06 09:01:33 +0000
commitc432d6933d55d1c04923fc8eacf17957db2b049f (patch)
tree07a9c9bfbf2080f69d3a1f5d4b204f8f485c9258 /src
parent16cadd0e4c78e4d3a847a779558e290f362016b1 (diff)
restore GSS_DLLIMP, KRB5_EXPORTVAR, NEAR macros
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12882 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/util/et/ChangeLog3
-rw-r--r--src/util/et/com_err.h7
2 files changed, 8 insertions, 2 deletions
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>