* libltdl/ltdl.c (LT_GLOBAL_DATA) [__CYGWIN__]: Also define on

Cygwin.
(LT_READTEXT_MODE): Ensure proper textmode fopen is used on
Cygwin.
* libltdl/ltdl.h (LT_SCOPE) [__CYGWIN__]: Also define on Cygwin.

diff --git a/ChangeLog b/ChangeLog
index 7523fc62db1601090f9d152b8553af37181f07fe..c9f7ec0abf1aefb6f51c7e6f09db43c384e97496 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-28  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+       * libltdl/ltdl.c (LT_GLOBAL_DATA) [__CYGWIN__]: Also define on
+       Cygwin.
+       (LT_READTEXT_MODE): Ensure proper textmode fopen is used on
+       Cygwin.
+       * libltdl/ltdl.h (LT_SCOPE) [__CYGWIN__]: Also define on Cygwin.
+
 2007-01-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [ cygwin, mingw ]

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index a13b83dec8f18286c060135479981e05176f7aa6..fad062ad311788d951b43741cb00530338062384 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -137,16 +137,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 \f
 /* --- WINDOWS SUPPORT --- */
 
-
-#ifdef 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__)
+#    ifdef DLL_EXPORT           /* defined by libtool (if required) */
+#      define LT_GLOBAL_DATA __declspec(dllexport)
+#    endif
+#  endif
+#  ifndef LT_GLOBAL_DATA        /* static linking or !__WINDOWS__ */
+#    define LT_GLOBAL_DATA
+#  endif
 #endif
 
 /* fopen() mode flags for reading a text file */
 #undef LT_READTEXT_MODE
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__CYGWIN__)
 #  define LT_READTEXT_MODE "rt"
 #else
 #  define LT_READTEXT_MODE "r"

diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index 8aaf3429ad42da3e1d3c0e97100583b3ea8848a8..166d5efea8f9d14631af845c23585ca42364844e 100644 (file)
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -127,11 +127,12 @@ LT_BEGIN_C_DECLS
 /* DLL building support on win32 hosts;  mostly to workaround their
    ridiculous implementation of data symbol exporting. */
 #ifndef LT_SCOPE
-#  ifdef __WINDOWS__
+#  if defined(__WINDOWS__) || defined(__CYGWIN__)
 #    ifdef DLL_EXPORT          /* defined by libtool (if required) */
 #      define LT_SCOPE __declspec(dllexport)
 #    endif
 #    ifdef 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