Daniel Lehman : msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 57c60d9c431c65d6a1b4c3a5b04b7f58fa011231
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=57c60d9c431c65d6a1b4c3a5b0...

Author: Daniel Lehman <dlehman(a)esri.com>
Date:   Mon Aug  8 15:28:49 2016 -0700

msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110.

Signed-off-by: Daniel Lehman <dlehman(a)esri.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcp140/msvcp140.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec
index 2a3e5a9..22c302e 100644
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -3621,17 +3621,17 @@
 @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn
 @ stub _Chmod
 @ stub _Close_dir
-@ cdecl _Cnd_broadcast(ptr) msvcp110._Cnd_broadcast
-@ cdecl _Cnd_destroy(ptr) msvcp110._Cnd_destroy
+@ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast
+@ cdecl _Cnd_destroy(ptr) _Cnd_destroy
 @ stub _Cnd_destroy_in_situ
 @ stub _Cnd_do_broadcast_at_thread_exit
-@ cdecl _Cnd_init(ptr) msvcp110._Cnd_init
+@ cdecl _Cnd_init(ptr) _Cnd_init
 @ stub _Cnd_init_in_situ
 @ stub _Cnd_register_at_thread_exit
-@ cdecl _Cnd_signal(ptr) msvcp110._Cnd_signal
-@ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp110._Cnd_timedwait
+@ cdecl _Cnd_signal(ptr) _Cnd_signal
+@ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait
 @ stub _Cnd_unregister_at_thread_exit
-@ cdecl _Cnd_wait(ptr ptr) msvcp110._Cnd_wait
+@ cdecl _Cnd_wait(ptr ptr) _Cnd_wait
 @ stub _Copy_file
 @ stub _Cosh
 @ stub _Current_get
@@ -3673,7 +3673,7 @@
 @ stub _Make_dir
 @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc
 @ stub _Mtx_clear_owner
-@ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns
+@ cdecl _Mtx_current_owns(ptr) _Mtx_current_owns
 @ cdecl _Mtx_destroy(ptr) _Mtx_destroy
 @ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ
 @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs