From a08ebfdf4062b543f723f305401933a1fcfea912 Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Sun, 28 Jan 2007 13:33:27 +0000 Subject: [PATCH] * libltdl/libltdl/lt__private.h (LT_GLOBAL_DATA) [__CYGWIN__]: Also define on Cygwin. * libltdl/libltdl/lt_system.h (LT_SCOPE) [__CYGWIN__]: Likewise. --- ChangeLog | 6 ++++++ libltdl/libltdl/lt__private.h | 15 +++++++++++---- libltdl/libltdl/lt_system.h | 3 ++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83cbc0cf9..ca35650c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-28 Charles Wilson + + * 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 * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [ cygwin, mingw ] diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h index d53c45517..43d51fb00 100644 --- 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 #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 b8173943f..bf5c0f9a2 100644 --- 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 -- 2.47.3