msvcrt: Don't include mbstring.h to avoid conflicts with system headers.
This commit is contained in:
parent
f3e13174c7
commit
26d50d6ee1
|
@ -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);
|
||||
|
||||
|
@ -331,6 +330,14 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu
|
|||
return (unsigned char *)cur - 1; /* ASCII CP or SB char */
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _mbclen(MSVCRT.@)
|
||||
*/
|
||||
unsigned int CDECL _mbclen(const unsigned char* str)
|
||||
{
|
||||
return _ismbblead(*str) ? 2 : 1;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _mbsinc(MSVCRT.@)
|
||||
*/
|
||||
|
@ -362,14 +369,6 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num)
|
|||
return (unsigned char*)str;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _mbclen(MSVCRT.@)
|
||||
*/
|
||||
unsigned int CDECL _mbclen(const unsigned char* str)
|
||||
{
|
||||
return _ismbblead(*str) ? 2 : 1;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _mbslen(MSVCRT.@)
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue