Module: wine Branch: master Commit: 5d4148e80b0c5ef743d82686d63865d6ac9a6eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4148e80b0c5ef743d82686d...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 18 11:51:22 2021 +0100
rtutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/rtutils/Makefile.in | 3 +-- dlls/rtutils/main.c | 47 ----------------------------------------------- 2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index d778852c9d4..f34937337af 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,8 +1,7 @@ MODULE = rtutils.dll IMPORTLIB = rtutils
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ - main.c \ tracing.c diff --git a/dlls/rtutils/main.c b/dlls/rtutils/main.c deleted file mode 100644 index 009101a5517..00000000000 --- a/dlls/rtutils/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * rtutils main - * - * Copyright 2009 Alexander Scott-Johns - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rtutils); - -/*********************************************************************** - * DllMain (RTUTILS.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - - return TRUE; -}