From f63fd8261087f14c00047355e1551d693e2898bf Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 13 Sep 2014 22:54:58 +0200 Subject: [PATCH] msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d6e2dca37a..84ddcc93d2b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1274,7 +1274,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ 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_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 11141903f32..36c413777aa 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ 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_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fc313a49c61..1745f64b1d3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -953,7 +953,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ 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_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a89dbfb03ef..ba3757aacbc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -929,7 +929,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ 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_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index fc5a5a985f6..c66152bcf17 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -377,7 +377,7 @@ unsigned int CDECL MSVCRT__get_output_format(void) /********************************************************************* * _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; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 742ada30971..96bbecc0834 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -898,7 +898,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ 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 _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp -- 2.11.4.GIT