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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcp60: Use --prefer-native instead of DLL_WINE_PREATTACH.
a770fc8a · Alexandre Julliard · 4ea044a6 · a770fc8a · a770fc8a
Commit a770fc8a authored Feb 26, 2021 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Makefile.in dlls/msvcp60/Makefile.in +1 -1

main.c dlls/msvcp60/main.c +0 -2

No files found.
--- 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 \

--- 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);