* libltdl/libltdl/lt__private.h (LT_GLOBAL_DATA) [__CYGWIN__]:

Also define on Cygwin.
* libltdl/libltdl/lt_system.h (LT_SCOPE) [__CYGWIN__]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 83cbc0cf98e221c8dd1c68e1a2151ec03c5b3fa0..ca35650c57c33d5d19e3c7d1c6458eb725eaab63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-28  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+       * libltdl/libltdl/lt__private.h (LT_GLOBAL_DATA) [__CYGWIN__]:
+       Also define on Cygwin.
+       * libltdl/libltdl/lt_system.h (LT_SCOPE) [__CYGWIN__]: Likewise.
+
 2007-01-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [ cygwin, mingw ]

diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index d53c455179dc8f7668d6888574091b13b430cd22..43d51fb00f189c4613b56240596782ec8b21f7fd 100644 (file)
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -59,10 +59,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #  include <dmalloc.h>
 #endif
 
-#if defined(DLL_EXPORT)
-#  define LT_GLOBAL_DATA       __declspec(dllexport)
-#else
-#  define LT_GLOBAL_DATA
+/* DLL building support on win32 hosts;  mostly to workaround their
+   ridiculous implementation of data symbol exporting. */
+#ifndef LT_GLOBAL_DATA
+# if defined(__WINDOWS__) || defined(__CYGWIN__)
+#  if defined(DLL_EXPORT)      /* defined by libtool (if required) */
+#   define LT_GLOBAL_DATA      __declspec(dllexport)
+#  endif
+# endif
+# ifndef LT_GLOBAL_DATA
+#  define LT_GLOBAL_DATA       /* static linking or !__WINDOWS__ */
+# endif
 #endif
 
 #ifndef __attribute__

diff --git a/libltdl/libltdl/lt_system.h b/libltdl/libltdl/lt_system.h
index b8173943f5d59e5e9ec1d599c7d37dd1530a186d..bf5c0f9a2c4a23af221d4bd17470802468f659c9 100644 (file)
--- a/libltdl/libltdl/lt_system.h
+++ b/libltdl/libltdl/lt_system.h
@@ -97,11 +97,12 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 /* DLL building support on win32 hosts;  mostly to workaround their
    ridiculous implementation of data symbol exporting. */
 #if !defined(LT_SCOPE)
-#  if defined(__WINDOWS__)
+#  if defined(__WINDOWS__) || defined(__CYGWIN__)
 #    if defined(DLL_EXPORT)            /* defined by libtool (if required) */
 #      define LT_SCOPE extern __declspec(dllexport)
 #    endif
 #    if defined(LIBLTDL_DLL_IMPORT)    /* define if linking with this dll */
+       /* note: cygwin/mingw compilers can rely instead on auto-import */
 #      define LT_SCOPE extern __declspec(dllimport)
 #    endif
 #  endif