Module: wine Branch: master Commit: 4ea044a6c712ccb7cc078c28397b2f3b2fca4ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea044a6c712ccb7cc078c283...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 26 10:23:20 2021 +0100
msvcirt: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 619a3dd66dd..1dee2b24c02 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -3,7 +3,7 @@ EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 IMPORTS = msvcrt
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ exception.c \ diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4d0dc1521f6..db4b736d272 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5211,8 +5211,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_exception(inst);