]> granicus.if.org Git - graphviz/commitdiff
Remove `_dll_import` define block in ast_common.h
authorErwin Janssen <erwinjanssen@outlook.com>
Mon, 19 Dec 2016 11:10:46 +0000 (12:10 +0100)
committerErwin Janssen <erwinjanssen@outlook.com>
Wed, 21 Dec 2016 13:54:26 +0000 (14:54 +0100)
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.

ast_common.h.in
features/common
lib/sfio/features/common
lib/sfio/sfhdr.h
lib/vmalloc/features/common
windows/include/ast_common.h

index 2a82271f625336d44271a7342a94de0ccbb37b8f..16f57e67a7d0d2c51906f65f973b31ec8181b375 100644 (file)
 #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>
index 43b59e1d8e67679d59b89f88a8d91a935671e16d..4f256c8dc19c6752df3a17a94450a77e19c27066 100644 (file)
@@ -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
index f675234204d3f7ac944ebcb7d2f2347e7bccca6d..23a1388c39ab7d4812b77fba9aeb732e1dd6add8 100644 (file)
@@ -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
index e4a147475eef587a8199ee8ed99aa53cd40cf0f4..9558c03252148f66fa85dc16689a932684c57c41 100644 (file)
@@ -854,7 +854,7 @@ extern "C" {
 #endif
 
 #ifndef errno
-    _astimport int errno;
+    extern int errno;
 #endif
 
 /* for portable encoding of double values */
index f675234204d3f7ac944ebcb7d2f2347e7bccca6d..23a1388c39ab7d4812b77fba9aeb732e1dd6add8 100644 (file)
@@ -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
index a24abcdfd662d9d039a33ca2e8913d04f62e6882..32442fde4672944479da29ab8b0d27a503eec61f 100644 (file)
 #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