First pass at arranging for DLLs on Windows: need to provide import

definition for users of extern data

diff --git a/lib/agraph/aghdr.h b/lib/agraph/aghdr.h
index 7ccd3bdc9d40cc8886ca1c5bce59d70ba7f862fb..11b90a38b7873e2d3950d768f4ad9228cf697572 100644 (file)
--- a/lib/agraph/aghdr.h
+++ b/lib/agraph/aghdr.h
@@ -21,6 +21,7 @@ extern "C" {
 
 #ifndef ATT_GRAPHPVT_H
 #define ATT_GRAPHPVT_H 1
+#define _BLD_agraph 1
 
 #ifndef EXTERN
 #define EXTERN extern

diff --git a/lib/agraph/agraph.h b/lib/agraph/agraph.h
index 31262b8dcd9240a34e1ca4f43138d3e34129f870..de4802052cdb680c757a20371a7645938c02fc09 100644 (file)
--- a/lib/agraph/agraph.h
+++ b/lib/agraph/agraph.h
@@ -397,6 +397,9 @@ for the name. */
 #   if !defined(_BLD_agraph) && defined(__IMPORT__)
 #      define extern  __IMPORT__
 #   endif
+#endif
+#if !defined(_BLD_agraph) && defined(_WIN32)
+#define extern __declspec(dllimport)
 #endif
 
     extern Agdesc_t Agdirected, Agstrictdirected, Agundirected,

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index 1daf92ab1cb9c34f59afd87973e38f4cf5ccd43c..02804f7ba128897691eb6a512732ae8e1ec5b2c1 100644 (file)
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -166,6 +166,9 @@ extern "C" {
 #if _BLD_cdt && defined(__EXPORT__)
 #define extern __EXPORT__
 #endif
+#if !_BLD_cdt && defined(_WIN32)
+#define extern __declspec(dllimport)
+#endif
 #if !_BLD_cdt && defined(__IMPORT__)
 #define extern __IMPORT__
 #endif

diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h
index 98445fd261a5f54560f85d614f98b7d1a9e30f31..76784399a09905c8a860a508318d77c7165bb359 100644 (file)
--- a/lib/sfio/sfio.h
+++ b/lib/sfio/sfio.h
@@ -277,6 +277,9 @@ extern "C" {
 
      _BEGIN_EXTERNS_ extern ssize_t _Sfi;
 
+#if !_BLD_sfio && defined(_WIN32)
+#define extern __declspec(dllimport)
+#endif
 /* standard in/out/err streams */
     extern Sfio_t *sfstdin;
     extern Sfio_t *sfstdout;
@@ -284,6 +287,7 @@ extern "C" {
     extern Sfio_t _Sfstdin;
     extern Sfio_t _Sfstdout;
     extern Sfio_t _Sfstderr;
+#undef extern
 
 #if _DLL && _DLL_INDIRECT_DATA
 /* The Uwin shared library environment requires these to be defined