Hi Charles, * Charles Wilson wrote on Sat, Aug 28, 2010 at 05:13:38PM CEST: > On 8/28/2010 9:21 AM, Ralf Wildenhues wrote: > > [__WINDOWS__, __CYGWIN__, _WIN32_WCE]: Define LT_DLSYM_CONST > I don't think __WINDOWS__ is the correct symbol; that is only defined by > Watcom C/C++. I think this should be changed to _WIN32 throughout.
Oops. Like, this? Would it be sufficient if I tested this on a GNU/Linux -> MinGW cross? Thanks, Ralf Fix symlist variable path to use _WIN32 instead of __WINDOWS__. * libltdl/config/ltmain.m4sh, libltdl/libltdl/lt_system.h, libltdl/m4/libtool.m4, tests/demo/foo.h, tests/pdemo/foo.h: Change __WINDOWS__ to _WIN32. Report by Charles Wilson. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index a7da74f..1aa2e0b 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -2005,7 +2005,7 @@ extern \"C\" { #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(__WINDOWS__) || defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST diff --git a/libltdl/libltdl/lt_system.h b/libltdl/libltdl/lt_system.h index a8481d6..f1545ce 100644 --- a/libltdl/libltdl/lt_system.h +++ b/libltdl/libltdl/lt_system.h @@ -77,7 +77,7 @@ or obtained by writing to the Free Software Foundation, Inc., #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(__WINDOWS__) || defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 7e5022a..89e2e6a 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3648,7 +3648,7 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(__WINDOWS__) || defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t...@_dlsym_const diff --git a/tests/demo/foo.h b/tests/demo/foo.h index 838264e..167096a 100644 --- a/tests/demo/foo.h +++ b/tests/demo/foo.h @@ -63,7 +63,7 @@ or obtained by writing to the Free Software Foundation, Inc., #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(__WINDOWS__) || defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST diff --git a/tests/pdemo/foo.h b/tests/pdemo/foo.h index dd4e86d..a2b2a4a 100644 --- a/tests/pdemo/foo.h +++ b/tests/pdemo/foo.h @@ -62,7 +62,7 @@ or obtained by writing to the Free Software Foundation, Inc., #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(__WINDOWS__) || defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST