Jacek Caban : include: Move __acrt_iob_func declaration to corecrt_wstdio.h.
Module: wine Branch: master Commit: 6017d33339ce49587467951c68b435dc9c77e41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6017d33339ce49587467951c6... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:30 2020 +0100 include: Move __acrt_iob_func declaration to corecrt_wstdio.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 6 ++++++ include/msvcrt/stdio.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 1480d32bf6..87f74916c5 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -41,6 +41,12 @@ typedef struct _iobuf #define WEOF (wint_t)(0xFFFF) #endif +FILE *__cdecl __acrt_iob_func(unsigned index); + +#define stdin (__acrt_iob_func(0)) +#define stdout (__acrt_iob_func(1)) +#define stderr (__acrt_iob_func(2)) + wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwc_nolock(wint_t,FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7477ac171a..6db7ebe50b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -61,12 +61,6 @@ FILE* __cdecl __iob_func(void); # endif #endif /* _STDIO_DEFINED */ -FILE *__cdecl __acrt_iob_func(unsigned index); - -#define stdin (__acrt_iob_func(0)) -#define stdout (__acrt_iob_func(1)) -#define stderr (__acrt_iob_func(2)) - /* return value for _get_output_format */ #define _TWO_DIGIT_EXPONENT 0x1
participants (1)
-
Alexandre Julliard