remove unused __IMPORT__ that affect static linking

diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index d9d5b514e2bb205f2b512de161fd784d4359097d..adbde1c15e8160282e55610355f222dad0244fb0 100644 (file)
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -29,12 +29,17 @@ extern "C" {
 
 #undef RS      /* hp.pa <signal.h> grabs this!! */
 
+
 #if _BLD_expr && defined(__EXPORT__)
 #define extern         __EXPORT__
 #endif
-#if !_BLD_expr && defined(__IMPORT__)
-#define extern         extern __IMPORT__
-#endif
+
+/*
+ * In graphviz we only use expr as a convience library, so we never need __IMPORT__
+ */
+// #if !_BLD_expr && defined(__IMPORT__)
+// #define extern              extern __IMPORT__
+// #endif
 
 /*
  * bison -pPREFIX misses YYSTYPE

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index 91b0ceb408dbae1555f30ad51fc7c3df3d7519c2..97617bc880cfb27ef4c919f642b19a2da11c6447 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -74,7 +74,7 @@ __declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
 /*end visual studio*/
 
 
-#ifndef WIN32_DLL
+#if !defined(WIN32_DLL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 #if defined(GVDLL)
        __declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
 #else

diff --git a/lib/vmalloc/vmalloc.h b/lib/vmalloc/vmalloc.h
index 597d97cdf152d3b8e356eaaab77121dd17ee6a8e..d36b2b97fa071dddf5bc71bbe6915e30fe045ae7 100644 (file)
--- a/lib/vmalloc/vmalloc.h
+++ b/lib/vmalloc/vmalloc.h
@@ -105,9 +105,13 @@ extern "C" {
 #if _BLD_vmalloc && defined(__EXPORT__)
 #define extern __EXPORT__
 #endif
-#if !_BLD_vmalloc && defined(__IMPORT__)
-#define extern __IMPORT__
-#endif
+
+/*
+ * In graphviz we only use vmalloc as a convience library, so we never need __IMPORT__
+ */
+// #if !_BLD_vmalloc && defined(__IMPORT__)
+// #define extern      __IMPORT__
+// #endif
 
 /*visual studio*/
 #ifdef WIN32_DLL