diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 7c8ccb5c9e0b..69db0a3bb544 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -694,14 +694,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ )) $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) - -ifeq ($(COM),MSC) -ifeq ($(USE_MINGW),) -$(eval $(call gb_Library_add_ldflags,vcl,\ - /ENTRY:LibMain@12 \ -)) -endif -endif endif ifeq ($(OS),LINUX) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 0aa2b752902f..c418063eaf45 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -23,32 +23,13 @@ SalShlData aSalShlData; -extern "C" +extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, DWORD nReason, LPVOID) { - -#ifdef __MINGW32__ -bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) -#else -BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); - -BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) -#endif -{ - // Unsere DLL-Initialisierung if ( nReason == DLL_PROCESS_ATTACH ) aSalShlData.mhInst = hInst; - -#ifndef __MINGW32__ - if ( !_CRT_INIT( hInst, nReason, pReserved ) ) - return 0; -#else - (void)pReserved; -#endif return 1; } -} - HCURSOR ImplLoadSalCursor( int nId ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" );