From: John Ellson <ellson@research.att.com>
Date: Thu, 16 Aug 2012 18:03:02 +0000 (-0400)
Subject: remove unused __IMPORT__ that affect static linking
X-Git-Tag: LAST_LIBGRAPH~32^2~340
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ae67d4b864d09702aed4d503f39023290fe0d99;p=graphviz

remove unused __IMPORT__ that affect static linking
---

diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index d9d5b514e..adbde1c15 100644
--- 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 91b0ceb40..97617bc88 100644
--- 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 597d97cdf..d36b2b97f 100644
--- 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