Module: wine Branch: master Commit: 79e950bb7989809f62573e3209f2cb1bc0852d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e950bb7989809f62573e320...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Dec 4 15:50:22 2020 +0100
msvcrt: Remove non-needed function declarations from msvcrt.h.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcrt/dir.c | 1 + dlls/msvcrt/exit.c | 1 + dlls/msvcrt/mbcs.c | 3 ++- dlls/msvcrt/msvcrt.h | 48 ----------------------------------------------- dlls/msvcrt/scanf.c | 1 + include/msvcrt/mbctype.h | 1 + include/msvcrt/mbstring.h | 1 + 7 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 53b97914cda..91aaaf5ff18 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -22,6 +22,7 @@ */
#include <corecrt_io.h> +#include <mbctype.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 492bcbf7b21..323d205b1bd 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <process.h> #include <signal.h> #include <stdio.h> diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cef67e71d47..03af50d8b01 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <limits.h> #include <mbctype.h> +#include <mbstring.h>
#include "msvcrt.h" #include "mtdll.h" @@ -577,7 +578,7 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu /********************************************************************* * _mbclen(MSVCRT.@) */ -unsigned int CDECL _mbclen(const unsigned char* str) +size_t CDECL _mbclen(const unsigned char* str) { return _ismbblead(*str) ? 2 : 1; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cdb35456ecb..28feb7d90df 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,27 +296,6 @@ extern FILE MSVCRT__iob[];
#define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF)
-int __cdecl MSVCRT_iswdigit(wint_t); - -int __cdecl MSVCRT__fgetc_nolock(FILE*); -int __cdecl MSVCRT__fputc_nolock(int,FILE*); -int __cdecl MSVCRT__ungetc_nolock(int,FILE*); -wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*); -wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*); -wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*); -int __cdecl MSVCRT__fseeki64_nolock(FILE*,__int64,int); -__int64 __cdecl MSVCRT__ftelli64(FILE* file); -__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*); -size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*); -int __cdecl MSVCRT__fclose_nolock(FILE*); -int __cdecl MSVCRT__fflush_nolock(FILE*); -FILE* __cdecl MSVCRT__iob_func(void); -__time32_t __cdecl MSVCRT__time32(__time32_t*); -__time64_t __cdecl MSVCRT__time64(__time64_t*); -FILE* __cdecl MSVCRT__fdopen(int, const char *); - #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
@@ -329,33 +308,6 @@ void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN;
-int __cdecl _getch(void); -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbblead_l(unsigned int, _locale_t); -int __cdecl _ismbclegal(unsigned int c); -int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -void __cdecl MSVCRT__searchenv(const char*,const char*,char*); -char* __cdecl _strset(char*,int); -int __cdecl _ungetch(int); -int __cdecl _cputs(const char*); -int WINAPIV _cprintf(const char*,...); -int WINAPIV _cwprintf(const wchar_t*,...); -char*** __cdecl MSVCRT___p__environ(void); -int* __cdecl __p___mb_cur_max(void); -wchar_t*** __cdecl MSVCRT___p__wenviron(void); -char* __cdecl MSVCRT__strdate(char* date); -char* __cdecl MSVCRT__strtime(char* date); -int __cdecl _setmbcp(int); -void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); -int __cdecl MSVCRT__towupper_l(wint_t,_locale_t); -int __cdecl MSVCRT__towlower_l(wint_t,_locale_t); -int __cdecl MSVCRT_strcmp(const char*, const char*); -char* __cdecl MSVCRT__itoa(int, char*, int); - -float __cdecl MSVCRT_floorf( float x ); -double __cdecl MSVCRT_sqrt( double x ); -float __cdecl MSVCRT_sqrtf( float x ); - enum fpmod { FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ FP_ROUND_DOWN, diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8ada1cccfa5..988cbd0920d 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <conio.h> #include <stdarg.h> #include <limits.h> #include <math.h> diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h index d821041ea16..a7a85135133 100644 --- a/include/msvcrt/mbctype.h +++ b/include/msvcrt/mbctype.h @@ -68,6 +68,7 @@ _ACRTIMP int __cdecl _setmbcp(int); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index fa35fcd1e42..1de3307326f 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -113,6 +113,7 @@ _ACRTIMP errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);
-
Alexandre Julliard