From aac5a28f1fb7084b2a70223000eba45cbb0e678f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Jul 2001 08:15:23 +0000 Subject: [PATCH] LIBISCCFG_EXTERNAL_DATA should be in lwres/platform.h --- lib/isc/include/isc/platform.h.in | 8 +------- lib/lwres/include/lwres/platform.h.in | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in index a13cfc2a8f..345f656713 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.23 2001/07/11 05:32:44 tale Exp $ */ +/* $Id: platform.h.in,v 1.24 2001/07/18 08:15:21 marka Exp $ */ #ifndef ISC_PLATFORM_H #define ISC_PLATFORM_H 1 @@ -157,7 +157,6 @@ #define LIBDNS_EXTERNAL_DATA #define LIBISCCC_EXTERNAL_DATA #define LIBISCCFG_EXTERNAL_DATA -#define LIBLWRES_EXTERNAL_DATA #else /* ISC_PLATFORM_USEDECLSPEC */ #ifdef LIBISC_EXPORTS #define LIBISC_EXTERNAL_DATA __declspec(dllexport) @@ -179,11 +178,6 @@ #else #define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport) #endif -#ifdef LIBLWRES_EXPORTS -#define LIBLWRES_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBLWRES_EXTERNAL_DATA __declspec(dllimport) -#endif #endif /* ISC_PLATFORM_USEDECLSPEC */ /* diff --git a/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in index 4bf5d8e62d..64fb8a1605 100644 --- a/lib/lwres/include/lwres/platform.h.in +++ b/lib/lwres/include/lwres/platform.h.in @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.11 2001/01/23 04:47:56 marka Exp $ */ +/* $Id: platform.h.in,v 1.12 2001/07/18 08:15:23 marka Exp $ */ #ifndef LWRES_PLATFORM_H #define LWRES_PLATFORM_H 1 @@ -67,4 +67,19 @@ */ @LWRES_PLATFORM_NEEDSYSSELECTH@ +/* + * Used to control how extern data is linked; needed for Win32 platforms. + */ +@LWRES_PLATFORM_USEDECLSPEC@ + +#ifndef LWRES_PLATFORM_USEDECLSPEC +#define LIBLWRES_EXTERNAL_DATA +#else +#ifdef LIBLWRES_EXPORTS +#define LIBLWRES_EXTERNAL_DATA __declspec(dllexport) +#else +#define LIBLWRES_EXTERNAL_DATA __declspec(dllimport) +#endif +#endif + #endif /* LWRES_PLATFORM_H */