Fix bad linking of initialized global variables. It would appear files

using a library must use a __declspec(dllimport) modifier to handle
initialized globals such as Agdirected and the default disciplines
correctly.

diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
index bed73fba13fea21eca8015b522396920b810b3a8..f1e2bde028fbe9061a7741356198eb3ca7b1b576 100644 (file)
--- a/lib/cgraph/cgraph.h
+++ b/lib/cgraph/cgraph.h
@@ -180,16 +180,11 @@ struct Agdisc_s {         /* user's discipline */
 };
 
        /* default resource disciplines */
-#if !defined(_BLD_cgraph) && defined(GVDLL)
-#define extern  __declspec(dllimport)
-#endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
-#ifndef CGRAPH_EXPORTS
+#if defined(WIN32) && !defined(CGRAPH_EXPORTS)
 #define extern __declspec(dllimport)
 #endif
-#endif
 /*end visual studio*/
 
 extern Agmemdisc_t AgMemDisc;
@@ -424,8 +419,8 @@ extern agusererrf agseterrf(agusererrf);
 #      define extern  __IMPORT__
 #   endif
 #endif
-#if !defined(_BLD_cgraph) && defined(GVDLL)
-#define extern  __declspec(dllimport)
+#if defined(WIN32) && !defined(CGRAPH_EXPORTS)
+#define extern __declspec(dllimport)
 #endif
 
 extern Agdesc_t Agdirected, Agstrictdirected, Agundirected,