From 6df45ac3ae21933d5f08c3bcbe3ab98a6df09391 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 28 Aug 2010 17:30:01 +0200 Subject: [PATCH] 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. Signed-off-by: Ralf Wildenhues --- ChangeLog | 6 ++++++ libltdl/config/ltmain.m4sh | 2 +- libltdl/libltdl/lt_system.h | 2 +- libltdl/m4/libtool.m4 | 2 +- tests/demo/foo.h | 2 +- tests/pdemo/foo.h | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b6d9e28a..3df8e2db9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-08-28 Ralf Wildenhues + 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. + Add $pic_flag to archive_cmds and archive_expsym_cmds. * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index a7da74ffb..1aa2e0b20 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 a8481d667..f1545ce3d 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 7e5022a88..89e2e6a23 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 838264ea3..167096a67 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 dd4e86d04..a2b2a4ac1 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 -- 2.47.3