From 054fb854091970400ade1460e5e0be317821df58 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Fri, 12 Mar 1999 00:03:04 +0000 Subject: [PATCH] win-mac.h: Define GSS_DLLIMP to be __declspec(dllimport) or __declspec(dllexport) depending on whether GSS_DLL_FILE is defined. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11263 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 11 +++++++++++ src/include/win-mac.h | 29 +++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 6eda6f4da..c500dd958 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,14 @@ +1999-03-11 Theodore Ts'o + + * win-mac.h: Define GSS_DLLIMP to be __declspec(dllimport) or + __declspec(dllexport) depending on whether GSS_DLL_FILE + is defined. + +1999-02-19 Theodore Ts'o + + * win-mac.h: Add definition for GSS_DLLIMP which is set ala + KRB5_DLLIMP, but controlled by the #define GSS_DLL_FILE. + Mon Feb 8 21:51:10 1999 Theodore Y. Ts'o * krb5.hin (krb5_get_realm_domain): Add appropriate modifiers so diff --git a/src/include/win-mac.h b/src/include/win-mac.h index 053a75edd..1a8b28497 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -68,18 +68,23 @@ #define HAVE_LABS #ifndef KRB5_CALLCONV -#ifdef _MSC_VER -# ifdef KRB5_DLL_FILE -# define KRB5_DLLIMP __declspec(dllexport) -# else -# define KRB5_DLLIMP __declspec(dllimport) -# endif -#else /* !_MSC_VER */ -# define KRB5_DLLIMP -#endif -#define KRB5_CALLCONV __stdcall -#define KRB5_CALLCONV_C __cdecl -#define KRB5_EXPORTVAR +# ifdef _MSC_VER +# ifdef KRB5_DLL_FILE +# define KRB5_DLLIMP __declspec(dllexport) +# else +# define KRB5_DLLIMP __declspec(dllimport) +# endif +# ifdef GSS_DLL_FILE +# define GSS_DLLIMP __declspec(dllexport) +# else +# define GSS_DLLIMP __declspec(dllimport) +# endif +# else /* !_MSC_VER */ +# define KRB5_DLLIMP +# endif +# define KRB5_CALLCONV __stdcall +# define KRB5_CALLCONV_C __cdecl +# define KRB5_EXPORTVAR #endif /* !KRB5_CALLCONV */ #endif /* _MSDOS */ -- 2.26.2