No idea why this would need to be an archaic LibMain
Change-Id: I4a41a2975f670b06159de5c94ab9a66ab204c725
This commit is contained in:
@@ -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)
|
||||
|
@@ -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" );
|
||||
|
Reference in New Issue
Block a user