diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2017-10-24 16:12:09 -0700 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-10-24 16:13:01 -0700 |
| commit | 56a4d3037e38a01903f2f35d45f86103976c0a5e (patch) | |
| tree | b3cf9dd290726729413dd65b88fcff2c05084615 | |
| parent | bd90fff392c0546c0b00b4c8657d59b42ed9c09e (diff) | |
| download | efl-56a4d3037e38a01903f2f35d45f86103976c0a5e.tar.gz | |
Evil: really drop Windows XP support
Summary: set WINVER macro to at least Vista macro value
Test Plan: compilation
Reviewers: cedric
Subscribers: jpeg
Differential Revision: https://phab.enlightenment.org/D5369
| -rw-r--r-- | m4/evil_windows.m4 | 4 | ||||
| -rw-r--r-- | src/lib/evil/evil_util.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4 index 8876d6c629..fff9f8251b 100644 --- a/m4/evil_windows.m4 +++ b/m4/evil_windows.m4 @@ -31,11 +31,11 @@ AC_MSG_RESULT([${_winver}]) case "${_winver}" in vista) - EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600" + EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600" _efl_windows_version="Windows Vista" ;; win7) - EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601" + EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601" _efl_windows_version="Windows 7" ;; *) diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c index ebbe0ad093..4f74353a16 100644 --- a/src/lib/evil/evil_util.c +++ b/src/lib/evil/evil_util.c @@ -90,9 +90,7 @@ evil_utf16_to_utf8(const wchar_t *text16) if (!text16) return NULL; -#if WINVER >= 0x0600 flag = WC_ERR_INVALID_CHARS; -#endif size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL); if (size8 == 0) |