From: Erwin Janssen <erwinjanssen@outlook.com>
Date: Mon, 19 Dec 2016 11:10:46 +0000 (+0100)
Subject: Remove `_dll_import` define block in ast_common.h
X-Git-Tag: 2.40.1~2^2~1^2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2930b9be73b11c30f610ce4e000361272013ed6;p=graphviz

Remove `_dll_import` define block in ast_common.h

The define `_dll_import` is never set by any file that includes
ast_common.h, the define block is therefore never triggered. DLL linkage
is Windows is currently done with `def` files.
---

diff --git a/ast_common.h.in b/ast_common.h.in
index 2a82271f6..16f57e67a 100644
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -19,22 +19,6 @@
 #define _typ_ssize_t    1	/* ssize_t is a type */
 /* */
 
-/* dynamic linked library external scope handling */
-#undef extern
-#if defined(_dll_import) && !defined(__EXPORT__) && _DLL_BLD
-#define __EXPORT__      __declspec(dllexport)
-#endif
-#if defined(_dll_import) && !defined(__IMPORT__)
-#define __IMPORT__      __declspec(dllimport)
-#endif
-#if !defined(_astimport)
-#if defined(__IMPORT__) && _DLL_BLD
-#define _astimport      __IMPORT__
-#else
-#define _astimport      extern
-#endif
-#endif /*_astimport*/
-
 #ifndef _AST_STD_H
 #       if defined(_sys_types)
 #       include <sys/types.h>
diff --git a/features/common b/features/common
index 43b59e1d8..4f256c8dc 100644
--- a/features/common
+++ b/features/common
@@ -64,24 +64,6 @@ xopen	stdio note{ Stdio fseek/fflush are X/Open-compliant }end execute{
 	}
 }end
 
-cat{
-	/* dynamic linked library external scope handling */
-	#undef extern
-	#if _dll_import && !defined(__EXPORT__) && _DLL_BLD
-	#define __EXPORT__	__declspec(dllexport)
-	#endif
-	#if _dll_import && !defined(__IMPORT__)
-	#define __IMPORT__	__declspec(dllimport)
-	#endif
-	#if !defined(_astimport)
-	#if defined(__IMPORT__) && _DLL_BLD
-	#define _astimport	__IMPORT__
-	#else
-	#define _astimport	extern
-	#endif
-	#endif /*_astimport*/
-}end
-
 cat{
 	#ifndef _AST_STD_H
 	#	if _sys_types
diff --git a/lib/sfio/features/common b/lib/sfio/features/common
index f67523420..23a1388c3 100644
--- a/lib/sfio/features/common
+++ b/lib/sfio/features/common
@@ -64,24 +64,6 @@ xopen	stdio note{ Stdio fseek/fflush are X/Open-compliant }end execute{
 	}
 }end
 
-cat{
-	/* dynamic linked library external scope handling */
-	#undef extern
-	#if _dll_import && !defined(__EXPORT__) && _DLL_BLD
-	#define __EXPORT__	__declspec(dllexport)
-	#endif
-	#if _dll_import && !defined(__IMPORT__)
-	#define __IMPORT__	__declspec(dllimport)
-	#endif
-	#if !defined(_astimport)
-	#if defined(__IMPORT__) && _DLL_BLD
-	#define _astimport	__IMPORT__
-	#else
-	#define _astimport	extern
-	#endif
-	#endif /*_astimport*/
-}end
-
 cat{
 	#ifndef _AST_STD_H
 	#	if _sys_types
diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index e4a147475..9558c0325 100644
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -854,7 +854,7 @@ extern "C" {
 #endif
 
 #ifndef errno
-    _astimport int errno;
+    extern int errno;
 #endif
 
 /* for portable encoding of double values */
diff --git a/lib/vmalloc/features/common b/lib/vmalloc/features/common
index f67523420..23a1388c3 100644
--- a/lib/vmalloc/features/common
+++ b/lib/vmalloc/features/common
@@ -64,24 +64,6 @@ xopen	stdio note{ Stdio fseek/fflush are X/Open-compliant }end execute{
 	}
 }end
 
-cat{
-	/* dynamic linked library external scope handling */
-	#undef extern
-	#if _dll_import && !defined(__EXPORT__) && _DLL_BLD
-	#define __EXPORT__	__declspec(dllexport)
-	#endif
-	#if _dll_import && !defined(__IMPORT__)
-	#define __IMPORT__	__declspec(dllimport)
-	#endif
-	#if !defined(_astimport)
-	#if defined(__IMPORT__) && _DLL_BLD
-	#define _astimport	__IMPORT__
-	#else
-	#define _astimport	extern
-	#endif
-	#endif /*_astimport*/
-}end
-
 cat{
 	#ifndef _AST_STD_H
 	#	if _sys_types
diff --git a/windows/include/ast_common.h b/windows/include/ast_common.h
index a24abcdfd..32442fde4 100644
--- a/windows/include/ast_common.h
+++ b/windows/include/ast_common.h
@@ -21,21 +21,6 @@
 #undef _typ_ssize_t
 #define _typ_ssize_t	0	/* ssize_t is a type */
 
-/* dynamic linked library external scope handling */
-#undef extern
-#if defined(_dll_import) && !defined(__EXPORT__) && defined(_DLL_BLD)
-#define __EXPORT__	__declspec(dllexport)
-#endif
-#if defined(_dll_import) && !defined(__IMPORT__)
-#define __IMPORT__	__declspec(dllimport)
-#endif
-#if !defined(_astimport)
-#if defined(__IMPORT__) && defined(_DLL_BLD)
-#define _astimport	__IMPORT__
-#else
-#define _astimport	extern
-#endif
-#endif /*_astimport*/
 #ifndef _AST_STD_H
 #	if _sys_types
 #	include	<sys/types.h>
@@ -48,4 +33,3 @@ typedef int ssize_t;
 #endif
 
 #endif
-#endif