more changes from Arif

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index d0687f8436ac7269844bb69904acc0729b3b8e32..87ccfc5e1e7b55bc3c1f8fe54f047246df044154 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -70,10 +70,15 @@ extern "C" {
 
     typedef struct gvplugin_available_s gvplugin_available_t;
 
-#if defined(GVDLL) && !defined(ENABLE_LTDL)
-    extern lt_symlist_t lt_preloaded_symbols[];
+
+#if !defined (ENABLE_LTDL)
+        lt_symlist_t lt_preloaded_symbols[];
+#else
+#if defined(GVDLL)
+       __declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
 #else
-    extern const lt_symlist_t lt_preloaded_symbols[];
+       extern const lt_symlist_t lt_preloaded_symbols[] ;
+#endif
 #endif
 
 #ifdef __cplusplus

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index a0aaa2841d6a6298072f92d73c9b2b2fa543ed41..06976121ccab80d60c4efe7ad72c0a8c89d6980a 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -60,7 +60,11 @@ static int glob (GVC_t * gvc, char*, int, int (*errfunc)(const char *, int), glo
 #include       "gvcint.h"
 #include        "gvcproc.h"
 
+#ifdef GVDLL
+__declspec(dllexport) int Demand_Loading;
+#else
 extern const int Demand_Loading;
+#endif
 
 #ifdef WITH_CODEGENS
     extern codegen_t HPGL_CodeGen, MIF_CodeGen, MP_CodeGen, PIC_CodeGen, DIA_CodeGen, VTX_CodeGen;