Module: wine Branch: master Commit: 26d50d6ee1ddcb74646b43355169657acad19a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d50d6ee1ddcb74646b433551... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 15:11:17 2007 +0200 msvcrt: Don't include mbstring.h to avoid conflicts with system headers. --- dlls/msvcrt/mbcs.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 258751e..3643fda 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -27,7 +27,6 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "msvcrt/mbctype.h" -#include "msvcrt/mbstring.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -332,6 +331,14 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu } /********************************************************************* + * _mbclen(MSVCRT.@) + */ +unsigned int CDECL _mbclen(const unsigned char* str) +{ + return _ismbblead(*str) ? 2 : 1; +} + +/********************************************************************* * _mbsinc(MSVCRT.@) */ unsigned char* CDECL _mbsinc(const unsigned char* str) @@ -363,14 +370,6 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) } /********************************************************************* - * _mbclen(MSVCRT.@) - */ -unsigned int CDECL _mbclen(const unsigned char* str) -{ - return _ismbblead(*str) ? 2 : 1; -} - -/********************************************************************* * _mbslen(MSVCRT.@) */ MSVCRT_size_t CDECL _mbslen(const unsigned char* str)