[vlc-commits] Win32: define _WIN32_IE in a centralized way

Jean-Baptiste Kempf git at videolan.org
Wed Jun 8 18:38:32 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun  8 18:30:03 2011 +0200| [4ecdf371bec7ea9921f5f536bdf59a190255e4f1] | committer: Jean-Baptiste Kempf

Win32: define _WIN32_IE in a centralized way

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ecdf371bec7ea9921f5f536bdf59a190255e4f1
---

 configure.ac                          |    1 +
 modules/misc/text_renderer/freetype.c |    1 -
 src/win32/dirs.c                      |    3 ---
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f78265..b4f7a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,6 +295,7 @@ case "${host_os}" in
     AC_CHECK_TOOL(WINDRES, windres, :)
     AC_CHECK_TOOL(OBJCOPY, objcopy, :)
     AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.])
+    AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.])
 
     case "${host_os}" in
       *wince* | *mingwce* | *mingw32ce*)
diff --git a/modules/misc/text_renderer/freetype.c b/modules/misc/text_renderer/freetype.c
index aad1d26..7eb4220 100644
--- a/modules/misc/text_renderer/freetype.c
+++ b/modules/misc/text_renderer/freetype.c
@@ -73,7 +73,6 @@
 
 /* Win32 GDI */
 #ifdef WIN32
-# define _WIN32_IE 0x0500
 # include <windows.h>
 # include <shlobj.h>
 # define HAVE_STYLES
diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index 519de2a..1f6ee33 100644
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -27,9 +27,6 @@
 
 #include <vlc_common.h>
 
-#ifndef _WIN32_IE
-# define _WIN32_IE 0x0501
-#endif
 #include <w32api.h>
 #ifndef UNDER_CE
 # include <direct.h>



More information about the vlc-commits mailing list