Alexandre Julliard : msvcp60: Use --prefer-native instead of DLL_WINE_PREATTACH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a770fc8a3a227e4fe6b19abad41fd0723273ce46
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a770fc8a3a227e4fe6b19abad...

Author: Alexandre Julliard 
Date:   Fri Feb 26 10:23:26 2021 +0100

msvcp60: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard

---

dlls/msvcp60/Makefile.in | 2 +-
 dlls/msvcp60/main.c      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in
index 5271fc21e20..b43395b44d1 100644
--- a/dlls/msvcp60/Makefile.in
+++ b/dlls/msvcp60/Makefile.in
@@ -3,7 +3,7 @@ EXTRADEFS = -D_MSVCP_VER=60
 PARENTSRC = ../msvcp90
 IMPORTS   = msvcrt

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    exception.c \
diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c
index 4f7b11be8a7..ab9a6a3179d 100644
--- a/dlls/msvcp60/main.c
+++ b/dlls/msvcp60/main.c
@@ -86,8 +86,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

switch (fdwReason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             init_cxx_funcs();
             _Init_locks__Init_locks_ctor(NULL);