summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--m4/evil_windows.m44
-rw-r--r--src/lib/evil/evil_util.c2
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}])
31 31
32case "${_winver}" in 32case "${_winver}" in
33 vista) 33 vista)
34 EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600" 34 EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
35 _efl_windows_version="Windows Vista" 35 _efl_windows_version="Windows Vista"
36 ;; 36 ;;
37 win7) 37 win7)
38 EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601" 38 EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601"
39 _efl_windows_version="Windows 7" 39 _efl_windows_version="Windows 7"
40 ;; 40 ;;
41 *) 41 *)
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)
90 if (!text16) 90 if (!text16)
91 return NULL; 91 return NULL;
92 92
93#if WINVER >= 0x0600
94 flag = WC_ERR_INVALID_CHARS; 93 flag = WC_ERR_INVALID_CHARS;
95#endif
96 94
97 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL); 95 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
98 if (size8 == 0) 96 if (size8 == 0)