Jacek Caban : tchar.h: Fix some macros.

Alexandre Julliard julliard at winehq.org
Thu Feb 13 15:36:29 CST 2020


Module: wine
Branch: master
Commit: 40c3662fb3d30458e20de7219973e97a70668740
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=40c3662fb3d30458e20de7219973e97a70668740

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Feb 13 13:13:21 2020 +0100

tchar.h: Fix some macros.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/tchar.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/tchar.h b/include/tchar.h
index 8de69c7466..e14aaf3884 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -104,7 +104,7 @@ extern "C" {
 #define _tchmod       WINE_tchar_routine(chmod,           _chmod,      _wchmod)
 #define _tcreat       WINE_tchar_routine(creat,           _creat,      _wcreat)
 #define _tcscat       WINE_tchar_routine(strcat,          _mbscat,     wcscat)
-#define _tcscat_s     WINE_tchar_routine(strncat_s,       _mbsncat_s,  wcsncat_s)
+#define _tcscat_s     WINE_tchar_routine(strcat_s,        _mbscat_s,   wcscat_s)
 #define _tcschr       WINE_tchar_routine(strchr,          _mbschr,     wcschr)
 #define _tcsclen      WINE_tchar_routine(strlen,          _mbslen,     wcslen)
 #define _tcscmp       WINE_tchar_routine(strcmp,          _mbscmp,     wcscmp)
@@ -123,17 +123,15 @@ extern "C" {
 #define _tcslwr_s     WINE_tchar_routine(_strlwr_s,       _mbslwr_s,   _wcslwr_s)
 #define _tcsnbcnt     WINE_tchar_routine(_strncnt,        _mbsnbcnt,   _wcnscnt)
 #define _tcsncat      WINE_tchar_routine(strncat,         _mbsnbcat,   wcsncat)
-#define _tcscat_s     WINE_tchar_routine(strcat_s,        _mbsnbcat_s, wcscat_s)
+#define _tcsncat_s    WINE_tchar_routine(strncat_s,       _mbsncat_s,  wcsncat_s)
 #define _tcsnccat     WINE_tchar_routine(strncat,         _mbsncat,    wcsncat)
 #define _tcsncmp      WINE_tchar_routine(strncmp,         _mbsnbcmp,   wcsncmp)
-#define _tcsncpy      WINE_tchar_routine(strncpy,         _mbsncpy,    wcsncpy)
-#define _tcsncpy_s    WINE_tchar_routine(strncpy_s,       _mbsncpy_s,  wcsncpy_s)
 #define _tcsnccmp     WINE_tchar_routine(strncmp,         _mbsncmp,    wcsncmp)
 #define _tcsnccnt     WINE_tchar_routine(_strncnt,        _mbsnccnt,   _wcsncnt)
 #define _tcsnccpy     WINE_tchar_routine(strncpy,         _mbsncpy,    wcsncpy)
 #define _tcsncicmp    WINE_tchar_routine(_strnicmp,       _mbsnicmp,   _wcsnicmp)
 #define _tcsncpy      WINE_tchar_routine(strncpy,         _mbsnbcpy,   wcsncpy)
-#define _tcsncpy      WINE_tchar_routine(strncpy_s,       _mbsnbcpy_s, wcsncpy_s)
+#define _tcsncpy_s    WINE_tchar_routine(strncpy_s,       _mbsnbcpy_s, wcsncpy_s)
 #define _tcsncset     WINE_tchar_routine(_strnset,        _mbsnset,    _wcsnset)
 #define _tcsnextc     WINE_tchar_routine(_strnextc,       _mbsnextc,   _wcsnextc)
 #define _tcsnicmp     WINE_tchar_routine(_strnicmp,       _mbsnicmp,   _wcsnicmp)




More information about the wine-cvs mailing list