From 0a002a156d370c6594b0d9bc94c0be8261efd195 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 21 Aug 2009 14:41:58 +0000 Subject: [PATCH] 2009-08-21 16:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/vm/maindllh.c * source/vm/maindllp.c ! Fixed DllMain() declaration for msvcarm targets. Thanks Przemek for the hint. --- harbour/ChangeLog | 6 ++++++ harbour/source/vm/maindllh.c | 2 +- harbour/source/vm/maindllp.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9403a2d274..a57fb04000 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-21 16:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/vm/maindllh.c + * source/vm/maindllp.c + ! Fixed DllMain() declaration for msvcarm targets. + Thanks Przemek for the hint. + 2009-08-21 16:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/vm/fm.c ! Fixed to suppress fcntl header in dlmalloc for msvcarm targets. diff --git a/harbour/source/vm/maindllh.c b/harbour/source/vm/maindllh.c index 0369fce087..5eb8e97409 100644 --- a/harbour/source/vm/maindllh.c +++ b/harbour/source/vm/maindllh.c @@ -62,7 +62,7 @@ #if defined( HB_OS_WIN ) -#if defined( HB_OS_WIN_CE ) && defined( __POCC__ ) +#if defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) || defined( __POCC__ ) ) HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HANDLE hInstance, DWORD fdwReason, PVOID pvReserved ) #else HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c index 00ef6f93ed..33d2b1ce73 100644 --- a/harbour/source/vm/maindllp.c +++ b/harbour/source/vm/maindllp.c @@ -140,7 +140,7 @@ static FARPROC hb_getProcAddress( LPCSTR szProcName ) return pProcAddr; } -#if defined( HB_OS_WIN_CE ) && defined( __POCC__ ) +#if defined( HB_OS_WIN_CE ) && ( defined( _MSC_VER ) || defined( __POCC__ ) ) HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HANDLE hInstance, DWORD fdwReason, PVOID pvReserved ) #else HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )