Commit 589f58d8 authored by Martin Storsjo's avatar Martin Storsjo Committed by Alexandre Julliard

msvcr120: Implement the _vacopy function.

parent 9978bfb6
...@@ -1792,7 +1792,7 @@ ...@@ -1792,7 +1792,7 @@
@ cdecl _unlock_file(ptr) MSVCRT__unlock_file @ cdecl _unlock_file(ptr) MSVCRT__unlock_file
@ cdecl _utime32(str ptr) @ cdecl _utime32(str ptr)
@ cdecl _utime64(str ptr) @ cdecl _utime64(str ptr)
@ stub _vacopy @ cdecl _vacopy(ptr ptr) MSVCR120__vacopy
@ cdecl _vcprintf(str ptr) @ cdecl _vcprintf(str ptr)
@ stub _vcprintf_l @ stub _vcprintf_l
@ stub _vcprintf_p @ stub _vcprintf_p
......
...@@ -490,3 +490,11 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( ...@@ -490,3 +490,11 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx(
TRACE("(%p %x %x)\n", cs, spin_count, flags); TRACE("(%p %x %x)\n", cs, spin_count, flags);
return InitializeCriticalSectionEx(cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags);
} }
/*********************************************************************
* _vacopy (MSVCR120.@)
*/
void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src)
{
__ms_va_copy(*dest, src);
}
...@@ -80,10 +80,16 @@ ...@@ -80,10 +80,16 @@
# define __ms_va_list __builtin_ms_va_list # define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list) # define __ms_va_end(list) __builtin_ms_va_end(list)
# define __ms_va_copy(dest,src) __builtin_ms_va_copy(dest,src)
# else # else
# define __ms_va_list va_list # define __ms_va_list va_list
# define __ms_va_start(list,arg) va_start(list,arg) # define __ms_va_start(list,arg) va_start(list,arg)
# define __ms_va_end(list) va_end(list) # define __ms_va_end(list) va_end(list)
# ifdef va_copy
# define __ms_va_copy(dest,src) va_copy(dest,src)
# else
# define __ms_va_copy(dest,src) ((dest) = (src))
# endif
# endif # endif
#endif #endif
......
...@@ -89,10 +89,16 @@ extern "C" { ...@@ -89,10 +89,16 @@ extern "C" {
# define __ms_va_list __builtin_ms_va_list # define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list) # define __ms_va_end(list) __builtin_ms_va_end(list)
# define __ms_va_copy(dest,src) __builtin_ms_va_copy(dest,src)
# else # else
# define __ms_va_list va_list # define __ms_va_list va_list
# define __ms_va_start(list,arg) va_start(list,arg) # define __ms_va_start(list,arg) va_start(list,arg)
# define __ms_va_end(list) va_end(list) # define __ms_va_end(list) va_end(list)
# ifdef va_copy
# define __ms_va_copy(dest,src) va_copy(dest,src)
# else
# define __ms_va_copy(dest,src) ((dest) = (src))
# endif
# endif # endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment