From c8b58baa78a893ec10d8f8e726f5bdf2a721b26e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 16 Oct 2001 05:28:14 +0000 Subject: [PATCH] Change #1042 was incomplete. cfg_categories and cfg_modules need to be visible outside of the DLL. --- lib/isccfg/include/isccfg/log.h | 6 +++--- lib/isccfg/log.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h index 3627e712bc..5deae905c1 100644 --- a/lib/isccfg/include/isccfg/log.h +++ b/lib/isccfg/include/isccfg/log.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.4 2001/10/11 01:07:50 gson Exp $ */ +/* $Id: log.h,v 1.5 2001/10/16 05:28:14 marka Exp $ */ #ifndef ISCCFG_LOG_H #define ISCCFG_LOG_H 1 @@ -23,8 +23,8 @@ #include #include -extern isc_logcategory_t cfg_categories[]; -extern isc_logmodule_t cfg_modules[]; +LIBISCCFG_EXTERNAL_DATA extern isc_logcategory_t cfg_categories[]; +LIBISCCFG_EXTERNAL_DATA extern isc_logmodule_t cfg_modules[]; #define CFG_LOGCATEGORY_CONFIG (&cfg_categories[0]) diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c index c5a6686d4e..3eabfa3bfc 100644 --- a/lib/isccfg/log.c +++ b/lib/isccfg/log.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.2 2001/03/13 03:04:05 gson Exp $ */ +/* $Id: log.c,v 1.3 2001/10/16 05:28:12 marka Exp $ */ #include @@ -27,7 +27,7 @@ * When adding a new category, be sure to add the appropriate * #define to . */ -isc_logcategory_t cfg_categories[] = { +LIBISCCFG_EXTERNAL_DATA isc_logcategory_t cfg_categories[] = { { "config", 0 }, { NULL, 0 } }; @@ -36,7 +36,7 @@ isc_logcategory_t cfg_categories[] = { * When adding a new module, be sure to add the appropriate * #define to . */ -isc_logmodule_t cfg_modules[] = { +LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = { { "isccfg/parser", 0 }, { NULL, 0 } };