Jean-Baptiste Kempf
2013-02-14 12:10:53 UTC
libdvdcss | branch: master | Jean-Baptiste Kempf <***@videolan.org> | Thu Feb 14 13:05:33 2013 +0100| [42ac89492c9de73f66b70643e0a1045ad7091f9a] | committer: Jean-Baptiste Kempf
Win32: define and use _WIN32_IE for shell api
This effectively drops support for Windows 95
configure.ac | 4 ++++
src/libdvdcss.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a260c12..ebca5c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ case x"${host_os}" in
;;
x*msvc*)
SYS_MSVC=1
+ AC_DEFINE([_WIN32_IE], 0x0401, [Define to '0x0401' for IE 4.01 (and shell) APIs.])
+ ;;
+ x*mingw* | *wince* | *mingwce*)
+ AC_DEFINE([_WIN32_IE], 0x0401, [Define to '0x0401' for IE 4.01 (and shell) APIs.])
;;
x*)
;;
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index cd92326..b5dd03b 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -239,7 +239,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
*/
if( psz_cache == NULL || psz_cache[0] == '\0' )
{
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x401
typedef HRESULT( WINAPI *SHGETFOLDERPATH )
( HWND, int, HANDLE, DWORD, LPTSTR );
Win32: define and use _WIN32_IE for shell api
This effectively drops support for Windows 95
http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=42ac89492c9de73f66b70643e0a1045ad7091f9a
---configure.ac | 4 ++++
src/libdvdcss.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a260c12..ebca5c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ case x"${host_os}" in
;;
x*msvc*)
SYS_MSVC=1
+ AC_DEFINE([_WIN32_IE], 0x0401, [Define to '0x0401' for IE 4.01 (and shell) APIs.])
+ ;;
+ x*mingw* | *wince* | *mingwce*)
+ AC_DEFINE([_WIN32_IE], 0x0401, [Define to '0x0401' for IE 4.01 (and shell) APIs.])
;;
x*)
;;
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index cd92326..b5dd03b 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -239,7 +239,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
*/
if( psz_cache == NULL || psz_cache[0] == '\0' )
{
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x401
typedef HRESULT( WINAPI *SHGETFOLDERPATH )
( HWND, int, HANDLE, DWORD, LPTSTR );