pullup:

1054.   [bug]           winnt: cfg_categories and cfg_modules need to be
                        visible outside of the libisccfg DLL.

diff --git a/CHANGES b/CHANGES
index 5789642f5276a70f776e10ac7ffbfa9f6216c032..2d08dc5cc6110efd6fcaf4cf754e20f76919e0d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1054.  [bug]           winnt: cfg_categories and cfg_modules need to be
+                       visible outside of the libisccfg DLL.
 
        --- 9.2.0rc7 released ---
 

diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 9ed4c9ba68532852059bf62ea67af5b080dae34c..58c1291ce9e354ad2708b16a2e333f63b8e7d173 100644 (file)
--- 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.3 2001/03/13 03:04:08 gson Exp $ */
+/* $Id: log.h,v 1.3.2.1 2001/10/16 05:58:29 marka Exp $ */
 
 #ifndef ISCCFG_LOG_H
 #define ISCCFG_LOG_H 1
@@ -23,8 +23,8 @@
 #include <isc/lang.h>
 #include <isc/log.h>
 
-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 c5a6686d4ea020fe7d116d75e402789e83357164..e7377dfe8b62e89f01f018093abe17e7a99e111a 100644 (file)
--- 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.2.2.1 2001/10/16 05:58:28 marka Exp $ */
 
 #include <config.h>
 
@@ -27,7 +27,7 @@
  * When adding a new category, be sure to add the appropriate
  * #define to <isccfg/log.h>.
  */
-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 <isccfg/log.h>.
  */
-isc_logmodule_t cfg_modules[] = {
+LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = {
        { "isccfg/parser",       0 },
        { NULL,                 0 }
 };