Anthony Fok : include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Feb 3 07:40:00 CST 2016


Module: wine
Branch: stable
Commit: 25de98d78cec9096c1ae622d7672f847143e323e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=25de98d78cec9096c1ae622d7672f847143e323e

Author: Anthony Fok <foka at debian.org>
Date:   Tue Jan  5 10:50:23 2016 -0700

include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used.

Signed-off-by: Anthony Fok <foka at debian.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit e034c419533065e82e60a22e02e3812335a5b02b)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 include/tchar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tchar.h b/include/tchar.h
index 38885d4..13c8ee6 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -23,8 +23,8 @@
 #error Wine should not include tchar.h internally
 #endif
 
-#if defined(_UNICODE) || defined(_MBCS)
-#error You must use msvcrt when building in Unicode/MBCS mode
+#if !defined(__MSVCRT__) && (defined(_UNICODE) || defined(_MBCS))
+#error You must use msvcrt when building in Unicode/MBCS mode [-mno-cygwin]
 #endif
 
 #ifdef __cplusplus




More information about the wine-cvs mailing list