marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW.

oldstable
Francois Gouget 2014-09-13 22:54:58 +02:00 committed by Alexandre Julliard
parent 97be8d027b
commit f63fd82610
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcr100/msvcr100.spec
View File

@ -1274,7 +1274,7 @@
@ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_invalid_parameter_handler(ptr)
@ stub _set_malloc_crt_max_wait @ stub _set_malloc_crt_max_wait
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr) @ cdecl _set_purecall_handler(ptr)
@ cdecl _seterrormode(long) @ cdecl _seterrormode(long)

2
dlls/msvcr110/msvcr110.spec
View File

@ -1632,7 +1632,7 @@
@ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_invalid_parameter_handler(ptr)
@ stub _set_malloc_crt_max_wait @ stub _set_malloc_crt_max_wait
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr) @ cdecl _set_purecall_handler(ptr)
@ cdecl _seterrormode(long) @ cdecl _seterrormode(long)

2
dlls/msvcr80/msvcr80.spec
View File

@ -953,7 +953,7 @@
@ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_invalid_parameter_handler(ptr)
@ stub _set_malloc_crt_max_wait @ stub _set_malloc_crt_max_wait
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr) @ cdecl _set_purecall_handler(ptr)
@ cdecl _set_sbh_threshold(long) @ cdecl _set_sbh_threshold(long)

2
dlls/msvcr90/msvcr90.spec
View File

@ -929,7 +929,7 @@
@ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_invalid_parameter_handler(ptr)
@ stub _set_malloc_crt_max_wait @ stub _set_malloc_crt_max_wait
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr) @ cdecl _set_purecall_handler(ptr)
@ cdecl _set_sbh_threshold(long) @ cdecl _set_sbh_threshold(long)

2
dlls/msvcrt/misc.c
View File

@ -377,7 +377,7 @@ unsigned int CDECL MSVCRT__get_output_format(void)
/********************************************************************* /*********************************************************************
* _set_output_format (MSVCRT.@) * _set_output_format (MSVCRT.@)
*/ */
unsigned int CDECL _set_output_format(unsigned int new_output_format) unsigned int CDECL MSVCRT__set_output_format(unsigned int new_output_format)
{ {
unsigned int ret = output_format; unsigned int ret = output_format;

2
dlls/msvcrt/msvcrt.spec
View File

@ -898,7 +898,7 @@
@ cdecl _set_error_mode(long) @ cdecl _set_error_mode(long)
# stub _set_fileinfo(long) # stub _set_fileinfo(long)
@ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format
@ cdecl _set_sbh_threshold(long) @ cdecl _set_sbh_threshold(long)
@ cdecl _seterrormode(long) @ cdecl _seterrormode(long)
@ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp