From e61793f0865117ad87a19d6e245bea8f3b712d1b Mon Sep 17 00:00:00 2001
From: Danny Mayer <source@isc.org>
Date: Mon, 19 Nov 2001 03:08:44 +0000
Subject: [PATCH] Added LIB*_EXTERNAL_DATA Macros necessary to make lib extern
 variables globally visible in Win32

---
 lib/bind9/include/bind9/version.h    | 12 +++++++-----
 lib/bind9/win32/version.c            | 10 +++++-----
 lib/dns/include/dns/lib.h            |  4 ++--
 lib/dns/include/dns/masterdump.h     |  6 +++---
 lib/dns/include/dns/name.h           |  4 ++--
 lib/dns/include/dns/tsig.h           |  6 +++---
 lib/dns/include/dns/version.h        | 12 +++++++-----
 lib/dns/lib.c                        |  4 ++--
 lib/dns/masterdump.c                 |  6 +++---
 lib/dns/name.c                       |  6 +++---
 lib/dns/sec/dst/dst_lib.c            |  4 ++--
 lib/dns/sec/dst/include/dst/lib.h    |  4 ++--
 lib/dns/tsig.c                       |  6 +++---
 lib/dns/win32/version.c              | 10 +++++-----
 lib/isc/include/isc/ipv6.h           |  6 +++---
 lib/isc/include/isc/lib.h            |  4 ++--
 lib/isc/include/isc/platform.h.in    |  8 +++++++-
 lib/isc/include/isc/version.h        | 12 +++++++-----
 lib/isc/lib.c                        |  4 ++--
 lib/isc/win32/include/isc/platform.h |  8 +++++++-
 lib/isc/win32/include/isc/time.h     |  6 +++---
 lib/isc/win32/time.c                 |  6 +++---
 lib/isc/win32/version.c              | 10 +++++-----
 lib/isccc/include/isccc/lib.h        |  4 ++--
 lib/isccc/include/isccc/version.h    | 12 +++++++-----
 lib/isccc/lib.c                      |  4 ++--
 lib/isccc/win32/version.c            | 10 +++++-----
 lib/isccfg/include/isccfg/version.h  | 12 +++++++-----
 lib/isccfg/win32/version.c           | 10 +++++-----
 lib/lwres/context.c                  |  6 +++---
 lib/lwres/include/lwres/lwres.h      |  7 ++++---
 lib/lwres/include/lwres/version.h    | 12 +++++++-----
 lib/lwres/win32/version.c            | 10 +++++-----
 33 files changed, 135 insertions(+), 110 deletions(-)

diff --git a/lib/bind9/include/bind9/version.h b/lib/bind9/include/bind9/version.h
index 27043e753b..f7ae026a26 100644
--- a/lib/bind9/include/bind9/version.h
+++ b/lib/bind9/include/bind9/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/16 23:20:51 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:05 mayer Exp $ */
 
-extern const char bind9_version[];
+#include <isc/platform.h>
 
-extern const unsigned int bind9_libinterface;
-extern const unsigned int bind9_librevision;
-extern const unsigned int bind9_libage;
+LIBBIND9_EXTERNAL_DATA extern const char bind9_version[];
+
+LIBBIND9_EXTERNAL_DATA extern const unsigned int bind9_libinterface;
+LIBBIND9_EXTERNAL_DATA extern const unsigned int bind9_librevision;
+LIBBIND9_EXTERNAL_DATA extern const unsigned int bind9_libage;
diff --git a/lib/bind9/win32/version.c b/lib/bind9/win32/version.c
index f0e6165ed4..b97b970238 100644
--- a/lib/bind9/win32/version.c
+++ b/lib/bind9/win32/version.c
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.1 2001/11/17 03:57:12 mayer Exp $ */
+/* $Id: version.c,v 1.2 2001/11/19 03:08:07 mayer Exp $ */
 
 #include <versions.h>
 
 #include <bind9/version.h>
 
-const char bind9_version[] = VERSION;
+LIBBIND9_EXTERNAL_DATA const char bind9_version[] = VERSION;
 
-const unsigned int bind9_libinterface = LIBINTERFACE;
-const unsigned int bind9_librevision = LIBREVISION;
-const unsigned int bind9_libage = LIBAGE;
+LIBBIND9_EXTERNAL_DATA const unsigned int bind9_libinterface = LIBINTERFACE;
+LIBBIND9_EXTERNAL_DATA const unsigned int bind9_librevision = LIBREVISION;
+LIBBIND9_EXTERNAL_DATA const unsigned int bind9_libage = LIBAGE;
diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index 5697360857..7f60b93541 100644
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.6 2001/01/09 21:52:58 bwelling Exp $ */
+/* $Id: lib.h,v 1.7 2001/11/19 03:08:13 mayer Exp $ */
 
 #ifndef DNS_LIB_H
 #define DNS_LIB_H 1
@@ -25,7 +25,7 @@
 
 ISC_LANG_BEGINDECLS
 
-extern isc_msgcat_t *dns_msgcat;
+LIBDNS_EXTERNAL_DATA extern isc_msgcat_t *dns_msgcat;
 
 void
 dns_lib_initmsgcat(void);
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index f48a3bc199..0af77e0982 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.h,v 1.24 2001/09/05 10:28:55 marka Exp $ */
+/* $Id: masterdump.h,v 1.25 2001/11/19 03:08:14 mayer Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1
@@ -70,7 +70,7 @@ LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
  * A master style format designed for cache files.  It prints explicit TTL
  * values on each record line and never uses $ORIGIN or relative names.
  */
-extern const dns_master_style_t dns_master_style_cache;
+LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_cache;
 
 /*
  * A master style that prints name, ttl, class, type, and value on 
@@ -78,7 +78,7 @@ extern const dns_master_style_t dns_master_style_cache;
  * Intended for generating master files which can be easily parsed 
  * by perl scripts and similar applications.
  */
-extern const dns_master_style_t dns_master_style_simple;
+LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_simple;
 
 /*
  * The style used for debugging, "dig" output, etc.
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 12e97108d6..d524e8c7b1 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.95 2001/08/28 03:58:19 marka Exp $ */
+/* $Id: name.h,v 1.96 2001/11/19 03:08:15 mayer Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -211,7 +211,7 @@ struct dns_name {
 #define DNS_NAMEATTR_CHAINING		0x0800		/* Used by resolver. */
 
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname;
-extern dns_name_t *dns_wildcardname;
+LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_wildcardname;
 
 /*
  * Standard size of a wire format name
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 8a8d766808..f96d84a032 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig.h,v 1.40 2001/07/16 05:10:28 mayer Exp $ */
+/* $Id: tsig.h,v 1.41 2001/11/19 03:08:16 mayer Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
@@ -35,9 +35,9 @@
  */
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacmd5_name;
 #define DNS_TSIG_HMACMD5_NAME		dns_tsig_hmacmd5_name
-extern dns_name_t *dns_tsig_gssapi_name;
+LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_gssapi_name;
 #define DNS_TSIG_GSSAPI_NAME		dns_tsig_gssapi_name
-extern dns_name_t *dns_tsig_gssapims_name;
+LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_gssapims_name;
 #define DNS_TSIG_GSSAPIMS_NAME		dns_tsig_gssapims_name
 
 /*
diff --git a/lib/dns/include/dns/version.h b/lib/dns/include/dns/version.h
index bd31bdbcfd..96b021696b 100644
--- a/lib/dns/include/dns/version.h
+++ b/lib/dns/include/dns/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/16 23:20:53 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:18 mayer Exp $ */
 
-extern const char dns_version[];
+#include <isc/platform.h>
 
-extern const unsigned int dns_libinterface;
-extern const unsigned int dns_librevision;
-extern const unsigned int dns_libage;
+LIBDNS_EXTERNAL_DATA extern const char dns_version[];
+
+LIBDNS_EXTERNAL_DATA extern const unsigned int dns_libinterface;
+LIBDNS_EXTERNAL_DATA extern const unsigned int dns_librevision;
+LIBDNS_EXTERNAL_DATA extern const unsigned int dns_libage;
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index 72441dd750..1076aea14d 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.9 2001/01/09 21:50:57 bwelling Exp $ */
+/* $Id: lib.c,v 1.10 2001/11/19 03:08:08 mayer Exp $ */
 
 #include <config.h>
 
@@ -31,7 +31,7 @@
  *** Globals
  ***/
 
-isc_msgcat_t *			dns_msgcat = NULL;
+LIBDNS_EXTERNAL_DATA isc_msgcat_t *			dns_msgcat = NULL;
 
 
 /***
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 3d9deda52a..2ff09f021c 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.62 2001/11/12 19:05:21 gson Exp $ */
+/* $Id: masterdump.c,v 1.63 2001/11/19 03:08:10 mayer Exp $ */
 
 #include <config.h>
 
@@ -160,7 +160,7 @@ dns_master_style_explicitttl = {
 	24, 32, 32, 40, 80, 8
 };
 
-const dns_master_style_t
+LIBDNS_EXTERNAL_DATA const dns_master_style_t
 dns_master_style_cache = {
 	DNS_STYLEFLAG_OMIT_OWNER |
 	DNS_STYLEFLAG_OMIT_CLASS |
@@ -171,7 +171,7 @@ dns_master_style_cache = {
 };
 
 const dns_master_style_t
-dns_master_style_simple = {
+LIBDNS_EXTERNAL_DATA dns_master_style_simple = {
 	0,
 	24, 32, 32, 40, 80, 8
 };
diff --git a/lib/dns/name.c b/lib/dns/name.c
index c02bad513d..98d9d352d6 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.128 2001/11/12 19:05:24 gson Exp $ */
+/* $Id: name.c,v 1.129 2001/11/19 03:08:11 mayer Exp $ */
 
 #include <config.h>
 
@@ -176,7 +176,7 @@ static dns_name_t root =
 };
 
 /* XXXDCL make const? */
-dns_name_t *dns_rootname = &root;
+LIBDNS_EXTERNAL_DATA dns_name_t *dns_rootname = &root;
 
 static unsigned char wild_ndata[] = { '\001', '*' };
 static unsigned char wild_offsets[] = { 0 };
@@ -192,7 +192,7 @@ static dns_name_t wild =
 };
 
 /* XXXDCL make const? */
-dns_name_t *dns_wildcardname = &wild;
+LIBDNS_EXTERNAL_DATA dns_name_t *dns_wildcardname = &wild;
 
 static void
 set_offsets(const dns_name_t *name, unsigned char *offsets,
diff --git a/lib/dns/sec/dst/dst_lib.c b/lib/dns/sec/dst/dst_lib.c
index b07c858626..cfdb3a9ff1 100644
--- a/lib/dns/sec/dst/dst_lib.c
+++ b/lib/dns/sec/dst/dst_lib.c
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_lib.c,v 1.8 2001/01/09 21:55:29 bwelling Exp $
+ * $Id: dst_lib.c,v 1.9 2001/11/19 03:08:19 mayer Exp $
  */
 
 #include <config.h>
@@ -34,7 +34,7 @@
  *** Globals
  ***/
 
-isc_msgcat_t *			dst_msgcat = NULL;
+LIBDNS_EXTERNAL_DATA isc_msgcat_t *		dst_msgcat = NULL;
 
 
 /***
diff --git a/lib/dns/sec/dst/include/dst/lib.h b/lib/dns/sec/dst/include/dst/lib.h
index b84499d791..18d8090354 100644
--- a/lib/dns/sec/dst/include/dst/lib.h
+++ b/lib/dns/sec/dst/include/dst/lib.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.6 2001/01/09 21:55:45 bwelling Exp $ */
+/* $Id: lib.h,v 1.7 2001/11/19 03:08:20 mayer Exp $ */
 
 #ifndef DST_LIB_H
 #define DST_LIB_H 1
@@ -25,7 +25,7 @@
 
 ISC_LANG_BEGINDECLS
 
-extern isc_msgcat_t *dst_msgcat;
+LIBDNS_EXTERNAL_DATA extern isc_msgcat_t *dst_msgcat;
 
 void
 dst_lib_initmsgcat(void);
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 91f64efa39..b1556d4c92 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.113 2001/09/27 17:49:11 bwelling Exp $
+ * $Id: tsig.c,v 1.114 2001/11/19 03:08:12 mayer Exp $
  */
 
 #include <config.h>
@@ -79,7 +79,7 @@ static dns_name_t gsstsig = {
 	{NULL, NULL}
 };
 
-dns_name_t *dns_tsig_gssapi_name = &gsstsig;
+LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_gssapi_name = &gsstsig;
 
 /* It's nice of Microsoft to conform to their own standard. */
 static unsigned char gsstsigms_ndata[] = "\003gss\011microsoft\003com";
@@ -94,7 +94,7 @@ static dns_name_t gsstsigms = {
 	{NULL, NULL}
 };
 
-dns_name_t *dns_tsig_gssapims_name = &gsstsigms;
+LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_gssapims_name = &gsstsigms;
 
 static isc_result_t
 tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg);
diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index 52c2eba3bc..082b671464 100644
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.2 2001/10/16 23:20:54 gson Exp $ */
+/* $Id: version.c,v 1.3 2001/11/19 03:08:22 mayer Exp $ */
 
 #include <versions.h>
 
 #include <dns/version.h>
 
-const char dns_version[] = VERSION;
+LIBDNS_EXTERNAL_DATA const char dns_version[] = VERSION;
 
-const unsigned int dns_libinterface = LIBINTERFACE;
-const unsigned int dns_librevision = LIBREVISION;
-const unsigned int dns_libage = LIBAGE;
+LIBDNS_EXTERNAL_DATA const unsigned int dns_libinterface = LIBINTERFACE;
+LIBDNS_EXTERNAL_DATA const unsigned int dns_librevision = LIBREVISION;
+LIBDNS_EXTERNAL_DATA const unsigned int dns_libage = LIBAGE;
diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index cab4408f09..64f16619f7 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.17 2001/01/09 21:57:02 bwelling Exp $ */
+/* $Id: ipv6.h,v 1.18 2001/11/19 03:08:24 mayer Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
@@ -75,8 +75,8 @@ struct in6_addr {
 #define IN6ADDR_ANY_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}}
 #define IN6ADDR_LOOPBACK_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}}
 
-extern const struct in6_addr in6addr_any;
-extern const struct in6_addr in6addr_loopback;
+LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_any;
+LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_loopback;
 
 struct sockaddr_in6 {
 #ifdef ISC_PLATFORM_HAVESALEN
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index 71878abc68..7feef43c5e 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.6 2001/01/09 21:57:06 bwelling Exp $ */
+/* $Id: lib.h,v 1.7 2001/11/19 03:08:25 mayer Exp $ */
 
 #ifndef ISC_LIB_H
 #define ISC_LIB_H 1
@@ -25,7 +25,7 @@
 
 ISC_LANG_BEGINDECLS
 
-extern isc_msgcat_t *isc_msgcat;
+LIBISC_EXTERNAL_DATA extern isc_msgcat_t *isc_msgcat;
 
 void
 isc_lib_initmsgcat(void);
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 18273c0ad7..e6f7cff30b 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.27 2001/11/01 22:39:27 gson Exp $ */
+/* $Id: platform.h.in,v 1.28 2001/11/19 03:08:26 mayer Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -180,6 +180,7 @@
 #define LIBDNS_EXTERNAL_DATA
 #define LIBISCCC_EXTERNAL_DATA
 #define LIBISCCFG_EXTERNAL_DATA
+#define LIBBIND9_EXTERNAL_DATA
 #else /* ISC_PLATFORM_USEDECLSPEC */
 #ifdef LIBISC_EXPORTS
 #define LIBISC_EXTERNAL_DATA __declspec(dllexport)
@@ -201,6 +202,11 @@
 #else
 #define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport)
 #endif
+#ifdef LIBBIND9_EXPORTS
+#define LIBBIND9_EXTERNAL_DATA __declspec(dllexport)
+#else
+#define LIBBIND9_EXTERNAL_DATA __declspec(dllimport)
+#endif
 #endif /* ISC_PLATFORM_USEDECLSPEC */
 
 /*
diff --git a/lib/isc/include/isc/version.h b/lib/isc/include/isc/version.h
index 38b325bd7d..57e9f94b5c 100644
--- a/lib/isc/include/isc/version.h
+++ b/lib/isc/include/isc/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/16 23:20:57 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:27 mayer Exp $ */
 
-extern const char isc_version[];
+#include <isc/platform.h>
 
-extern const unsigned int isc_libinterface;
-extern const unsigned int isc_librevision;
-extern const unsigned int isc_libage;
+LIBISC_EXTERNAL_DATA extern const char isc_version[];
+
+LIBISC_EXTERNAL_DATA extern const unsigned int isc_libinterface;
+LIBISC_EXTERNAL_DATA extern const unsigned int isc_librevision;
+LIBISC_EXTERNAL_DATA extern const unsigned int isc_libage;
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 7b74eaf4c1..95dd479001 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.8 2001/01/09 21:56:12 bwelling Exp $ */
+/* $Id: lib.c,v 1.9 2001/11/19 03:08:23 mayer Exp $ */
 
 #include <config.h>
 
@@ -30,7 +30,7 @@
  *** Globals
  ***/
 
-isc_msgcat_t *			isc_msgcat = NULL;
+LIBISC_EXTERNAL_DATA isc_msgcat_t *		isc_msgcat = NULL;
 
 
 /***
diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index 7cbbb4583a..a659040595 100644
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.5 2001/07/26 03:15:15 mayer Exp $ */
+/* $Id: platform.h,v 1.6 2001/11/19 03:08:31 mayer Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -79,4 +79,10 @@
 #define LIBDNS_EXTERNAL_DATA __declspec( dllimport )
 #endif
 
+#ifdef LIBBIND9_EXPORTS
+#define LIBBIND9_EXTERNAL_DATA __declspec( dllexport )
+#else
+#define LIBBIND9_EXTERNAL_DATA __declspec( dllimport )
+#endif
+
 #endif /* ISC_PLATFORM_H */
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index 40d6319d68..94d5405dc8 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.23 2001/09/05 17:22:55 gson Exp $ */
+/* $Id: time.h,v 1.24 2001/11/19 03:08:32 mayer Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
@@ -39,7 +39,7 @@ struct isc_interval {
 	isc_int64_t interval;
 };
 
-extern isc_interval_t *isc_interval_zero;
+LIBISC_EXTERNAL_DATA extern isc_interval_t *isc_interval_zero;
 
 ISC_LANG_BEGINDECLS
 
@@ -82,7 +82,7 @@ struct isc_time {
 	FILETIME absolute;
 };
 
-extern isc_time_t *isc_time_epoch;
+LIBISC_EXTERNAL_DATA extern isc_time_t *isc_time_epoch;
 
 void
 isc_time_settoepoch(isc_time_t *t);
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index b2d8c270f6..5e4fe486e0 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.33 2001/10/13 01:57:37 gson Exp $ */
+/* $Id: time.c,v 1.34 2001/11/19 03:08:28 mayer Exp $ */
 
 #include <config.h>
 
@@ -48,14 +48,14 @@
  ***/
 
 static isc_time_t epoch = { { 0, 0 } };
-isc_time_t *isc_time_epoch = &epoch;
+LIBISC_EXTERNAL_DATA isc_time_t *isc_time_epoch = &epoch;
 
 /***
  *** Intervals
  ***/
 
 static isc_interval_t zero_interval = { 0 };
-isc_interval_t *isc_interval_zero = &zero_interval;
+LIBISC_EXTERNAL_DATA isc_interval_t *isc_interval_zero = &zero_interval;
 
 void
 isc_interval_set(isc_interval_t *i, unsigned int seconds,
diff --git a/lib/isc/win32/version.c b/lib/isc/win32/version.c
index df0f30c5bc..8480e7f1b7 100644
--- a/lib/isc/win32/version.c
+++ b/lib/isc/win32/version.c
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.3 2001/10/16 23:20:57 gson Exp $ */
+/* $Id: version.c,v 1.4 2001/11/19 03:08:29 mayer Exp $ */
 
 #include <versions.h>
 
 #include <isc/version.h>
 
-const char isc_version[] = VERSION;
+LIBISC_EXTERNAL_DATA const char isc_version[] = VERSION;
 
-const unsigned int isc_libinterface = LIBINTERFACE;
-const unsigned int isc_librevision = LIBREVISION;
-const unsigned int isc_libage = LIBAGE;
+LIBISC_EXTERNAL_DATA const unsigned int isc_libinterface = LIBINTERFACE;
+LIBISC_EXTERNAL_DATA const unsigned int isc_librevision = LIBREVISION;
+LIBISC_EXTERNAL_DATA const unsigned int isc_libage = LIBAGE;
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index ae720526e8..bd098577b1 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -16,7 +16,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.2 2001/03/27 20:08:09 bwelling Exp $ */
+/* $Id: lib.h,v 1.3 2001/11/19 03:08:34 mayer Exp $ */
 
 #ifndef ISCCC_LIB_H
 #define ISCCC_LIB_H 1
@@ -26,7 +26,7 @@
 
 ISC_LANG_BEGINDECLS
 
-extern isc_msgcat_t *isccc_msgcat;
+LIBISCCC_EXTERNAL_DATA extern isc_msgcat_t *isccc_msgcat;
 
 void
 isccc_lib_initmsgcat(void);
diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index 3c550d6a80..ba22888d0f 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/16 23:21:01 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:35 mayer Exp $ */
 
-extern const char isccc_version[];
+#include <isc/platform.h>
 
-extern const unsigned int isccc_libinterface;
-extern const unsigned int isccc_librevision;
-extern const unsigned int isccc_libage;
+LIBISCCC_EXTERNAL_DATA extern const char isccc_version[];
+
+LIBISCCC_EXTERNAL_DATA extern const unsigned int isccc_libinterface;
+LIBISCCC_EXTERNAL_DATA extern const unsigned int isccc_librevision;
+LIBISCCC_EXTERNAL_DATA extern const unsigned int isccc_libage;
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index de6b3fbe45..f65a9f7801 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -16,7 +16,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.2 2001/03/27 20:07:58 bwelling Exp $ */
+/* $Id: lib.c,v 1.3 2001/11/19 03:08:33 mayer Exp $ */
 
 #include <config.h>
 
@@ -32,7 +32,7 @@
  *** Globals
  ***/
 
-isc_msgcat_t *			isccc_msgcat = NULL;
+LIBISCCC_EXTERNAL_DATA isc_msgcat_t *		isccc_msgcat = NULL;
 
 
 /***
diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c
index 96ebbf1457..895a2e8472 100644
--- a/lib/isccc/win32/version.c
+++ b/lib/isccc/win32/version.c
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.3 2001/10/16 23:21:02 gson Exp $ */
+/* $Id: version.c,v 1.4 2001/11/19 03:08:36 mayer Exp $ */
 
 #include <versions.h>
 
 #include <isccc/version.h>
 
-const char isccc_version[] = VERSION;
+LIBISCCC_EXTERNAL_DATA const char isccc_version[] = VERSION;
 
-const unsigned int isccc_libinterface = LIBINTERFACE;
-const unsigned int isccc_librevision = LIBREVISION;
-const unsigned int isccc_libage = LIBAGE;
+LIBISCCC_EXTERNAL_DATA const unsigned int isccc_libinterface = LIBINTERFACE;
+LIBISCCC_EXTERNAL_DATA const unsigned int isccc_librevision = LIBREVISION;
+LIBISCCC_EXTERNAL_DATA const unsigned int isccc_libage = LIBAGE;
diff --git a/lib/isccfg/include/isccfg/version.h b/lib/isccfg/include/isccfg/version.h
index 50fed14663..d6dc98c908 100644
--- a/lib/isccfg/include/isccfg/version.h
+++ b/lib/isccfg/include/isccfg/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/16 23:21:05 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:37 mayer Exp $ */
 
-extern const char cfg_version[];
+#include <isc/platform.h>
 
-extern const unsigned int cfg_libinterface;
-extern const unsigned int cfg_librevision;
-extern const unsigned int cfg_libage;
+LIBISCCFG_EXTERNAL_DATA extern const char cfg_version[];
+
+LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_libinterface;
+LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_librevision;
+LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_libage;
diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c
index c3e1ab2329..15c1157a70 100644
--- a/lib/isccfg/win32/version.c
+++ b/lib/isccfg/win32/version.c
@@ -15,15 +15,15 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.2 2001/10/16 23:21:05 gson Exp $ */
+/* $Id: version.c,v 1.3 2001/11/19 03:08:39 mayer Exp $ */
 
 #include <versions.h>
 
 #include <isccfg/version.h>
 
-const char cfg_version[] = VERSION;
+LIBISCCFG_EXTERNAL_DATA const char cfg_version[] = VERSION;
 
-const unsigned int cfg_libinterface = LIBINTERFACE;
-const unsigned int cfg_librevision = LIBREVISION;
-const unsigned int cfg_libage = LIBAGE;
+LIBISCCFG_EXTERNAL_DATA const unsigned int cfg_libinterface = LIBINTERFACE;
+LIBISCCFG_EXTERNAL_DATA const unsigned int cfg_librevision = LIBREVISION;
+LIBISCCFG_EXTERNAL_DATA const unsigned int cfg_libage = LIBAGE;
 
diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index 646f348da4..c9a4e02f61 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.c,v 1.41 2001/07/19 16:59:32 gson Exp $ */
+/* $Id: context.c,v 1.42 2001/11/19 03:08:40 mayer Exp $ */
 
 #include <config.h>
 
@@ -60,8 +60,8 @@ do { \
 } while (0)
 #endif
 
-lwres_uint16_t lwres_udp_port = LWRES_UDP_PORT;
-const char *lwres_resolv_conf = LWRES_RESOLV_CONF;
+LIBLWRES_EXTERNAL_DATA lwres_uint16_t lwres_udp_port = LWRES_UDP_PORT;
+LIBLWRES_EXTERNAL_DATA const char *lwres_resolv_conf = LWRES_RESOLV_CONF;
 
 static void *
 lwres_malloc(void *, size_t);
diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index 724406f33d..6f983082dc 100644
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres.h,v 1.49 2001/07/02 20:46:29 bwelling Exp $ */
+/* $Id: lwres.h,v 1.50 2001/11/19 03:08:41 mayer Exp $ */
 
 #ifndef LWRES_LWRES_H
 #define LWRES_LWRES_H 1
@@ -26,6 +26,7 @@
 #include <lwres/lang.h>
 #include <lwres/list.h>
 #include <lwres/lwpacket.h>
+#include <lwres/platform.h>
 
 /*
  * Design notes:
@@ -252,9 +253,9 @@ LWRES_LANG_BEGINDECLS
 /*
  * This is in host byte order.
  */
-extern lwres_uint16_t lwres_udp_port;
+LIBLWRES_EXTERNAL_DATA extern lwres_uint16_t lwres_udp_port;
 
-extern const char *lwres_resolv_conf;
+LIBLWRES_EXTERNAL_DATA extern const char *lwres_resolv_conf;
 
 lwres_result_t
 lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
diff --git a/lib/lwres/include/lwres/version.h b/lib/lwres/include/lwres/version.h
index d6c0329360..a58f0da5af 100644
--- a/lib/lwres/include/lwres/version.h
+++ b/lib/lwres/include/lwres/version.h
@@ -15,10 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.1 2001/10/23 18:45:52 gson Exp $ */
+/* $Id: version.h,v 1.2 2001/11/19 03:08:43 mayer Exp $ */
 
-extern const char lwres_version[];
+#include <lwres/platform.h>
 
-extern const unsigned int lwres_libinterface;
-extern const unsigned int lwres_librevision;
-extern const unsigned int lwres_libage;
+LIBLWRES_EXTERNAL_DATA extern const char lwres_version[];
+
+LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_libinterface;
+LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_librevision;
+LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_libage;
diff --git a/lib/lwres/win32/version.c b/lib/lwres/win32/version.c
index 58509a26c9..2d70985b3c 100644
--- a/lib/lwres/win32/version.c
+++ b/lib/lwres/win32/version.c
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.2 2001/10/23 18:45:53 gson Exp $ */
+/* $Id: version.c,v 1.3 2001/11/19 03:08:44 mayer Exp $ */
 
 #include <versions.h>
 
 #include <lwres/version.h>
 
-const char lwres_version[] = VERSION;
+LIBLWRES_EXTERNAL_DATA const char lwres_version[] = VERSION;
 
-const unsigned int lwres_libinterface = LIBINTERFACE;
-const unsigned int lwres_librevision = LIBREVISION;
-const unsigned int lwres_libage = LIBAGE;
+LIBLWRES_EXTERNAL_DATA const unsigned int lwres_libinterface = LIBINTERFACE;
+LIBLWRES_EXTERNAL_DATA const unsigned int lwres_librevision = LIBREVISION;
+LIBLWRES_EXTERNAL_DATA const unsigned int lwres_libage = LIBAGE;