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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 9b6d9e28a13b37948102a963b11808d3b5f2d523..3df8e2db9e510371de4529d9d4174165d85e3447 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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)
        <archive_cmds, archive_expsym_cmds>

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index a7da74ffbcc5c5c0c6d91752312162abb6eebea1..1aa2e0b20a3f18fd8c29e789c17863ea7305d402 100644 (file)
--- 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 a8481d667b50fbc89edcb237ed61bac5d44c648d..f1545ce3dc1a4bc3faaf9a5b2ae824333de50aac 100644 (file)
--- 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 7e5022a8861c0f271798cb8bc3820bba87480b4a..89e2e6a230bd4b8b4a44e79c7bcc548e8509dabf 100644 (file)
--- 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 838264ea3a872b12a621a679914745376489c3a6..167096a672175918fb2bec86cf66e9fb3ec81e9e 100644 (file)
--- 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 dd4e86d0454f7d7852494218aeba05a65365314a..a2b2a4ac113cf0768702f0943c7671b000667126 100644 (file)
--- 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