vlc | branch: master | Steve Lhomme <[email protected]> | Wed Apr 3 09:49:36 2019 +0200| [16040ccb7acf8b7797c1a93cc35f1fcdbc8aa690] | committer: Steve Lhomme
do not use tchar.h in VLC We don't include tchar.h anymore, nor TCHAR, nor the *tcs* APIs. Using any of these will fail to compile if tchar.h is not included. In MinGW it's never included through other headers. We don't need _UNICODE either which is specific to tchar.h. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16040ccb7acf8b7797c1a93cc35f1fcdbc8aa690 --- configure.ac | 1 - include/vlc_charset.h | 7 ------- include/vlc_common.h | 2 -- modules/gui/skins2/win32/win32_factory.cpp | 1 - 4 files changed, 11 deletions(-) diff --git a/configure.ac b/configure.ac index adf61a1929..3ff54e28ea 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,6 @@ case "${host_os}" in AC_DEFINE([_WIN32_WINNT], 0x0601, [Define to '0x0601' for Windows 7 APIs.]) ]) AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) - AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) AC_DEFINE([_ISOC99_SOURCE], [1], [Extensions to ISO C89 from ISO C99.]) AC_DEFINE([_ISOC11_SOURCE], [1], [Extensions to ISO C99 from ISO C11.]) diff --git a/include/vlc_charset.h b/include/vlc_charset.h index 5790694ffe..2397e1f9ed 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -266,13 +266,6 @@ static inline char *ToANSI (const char *utf8) return ToCodePage (GetACP (), utf8); } -# ifdef UNICODE -# define FromT FromWide -# define ToT ToWide -# else -# define FromT FromANSI -# define ToT ToANSI -# endif # define FromLocale FromANSI # define ToLocale ToANSI # define LocaleFree(s) free((char *)(s)) diff --git a/include/vlc_common.h b/include/vlc_common.h index 033c618677..c2e14e4209 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -1109,8 +1109,6 @@ static inline void SetQWLE (void *p, uint64_t qw) # ifndef O_NONBLOCK # define O_NONBLOCK 0 # endif - -# include <tchar.h> #endif /* _WIN32 */ typedef struct { diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp index 3a470c5472..7cd90f2de5 100644 --- a/modules/gui/skins2/win32/win32_factory.cpp +++ b/modules/gui/skins2/win32/win32_factory.cpp @@ -30,7 +30,6 @@ #include <windows.h> #include <winuser.h> #include <wingdi.h> -#include <tchar.h> #include <shellapi.h> #include "win32_factory.hpp" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
