[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/win

[Stephan Bergmann]

 vcl/Library_vcl.mk            |    8 --------
 vcl/win/source/app/salshl.cxx |   21 +--------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

New commits:
commit 322ca1cea29a0ef94696a6cd0807ad3bb5bf6edf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 8 17:59:03 2014 +0100

    No idea why this would need to be an archaic LibMain
    
    Change-Id: I4a41a2975f670b06159de5c94ab9a66ab204c725

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7c8ccb5..69db0a3 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 at 12 \
-))
-endif
-endif
 endif
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 0aa2b75..c418063 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" );