Alexandre Julliard : include: Disallow using unicode.h when building against msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Apr 1 16:32:02 CDT 2019
Module: wine
Branch: master
Commit: b278caf1528c5d88b641273453eeb78a40e9d100
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b278caf1528c5d88b641273453eeb78a40e9d100
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 1 12:21:25 2019 +0200
include: Disallow using unicode.h when building against msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/wine/unicode.h | 4 ++++
programs/xcopy/xcopy.c | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/wine/unicode.h b/include/wine/unicode.h
index 22bb6dd..ff6f656 100644
--- a/include/wine/unicode.h
+++ b/include/wine/unicode.h
@@ -31,6 +31,10 @@
#error This file should not be used in Wine tests
#endif
+#ifdef __WINE_USE_MSVCRT
+#error This file should not be used with msvcrt headers
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index eb8c3f0..0d31d7c 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -46,7 +46,6 @@
#include <stdlib.h>
#include <windows.h>
#include <wine/debug.h>
-#include <wine/unicode.h>
#include "xcopy.h"
WINE_DEFAULT_DEBUG_CHANNEL(xcopy);
More information about the wine-cvs
mailing list