diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9236d5aa35..181deef1e6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-11 18:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/win_dll.c + - Deleted WINAPI keyword from win64 .dll support. + It has no meaning under win64, and win64 .dll support is + not only meant to access winapi functions anyway. + 2010-02-11 13:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * external/libhpdf/Makefile * Suppressing 'deprecated' warnings in libharu code until it diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c index 335caa3ff1..a42017cfb1 100644 --- a/harbour/contrib/hbwin/win_dll.c +++ b/harbour/contrib/hbwin/win_dll.c @@ -500,22 +500,22 @@ static void hb_u64ret( PHB_WINCALL wcall, HB_U64 nValue ) } } -typedef HB_U64( WINAPI * WIN64_00 ) ( void ); -typedef HB_U64( WINAPI * WIN64_01 ) ( HB_U64 ); -typedef HB_U64( WINAPI * WIN64_02 ) ( HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_03 ) ( HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_04 ) ( HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_05 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_06 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_07 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_08 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_09 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_10 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_11 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_12 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_13 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_14 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); -typedef HB_U64( WINAPI * WIN64_15 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_00 ) ( void ); +typedef HB_U64( * WIN64_01 ) ( HB_U64 ); +typedef HB_U64( * WIN64_02 ) ( HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_03 ) ( HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_04 ) ( HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_05 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_06 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_07 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_08 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_09 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_10 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_11 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_12 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_13 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_14 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); +typedef HB_U64( * WIN64_15 ) ( HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64, HB_U64 ); static HB_U64 win64_00( FARPROC p ) { return ( ( WIN64_00 ) *p )(); } static HB_U64 win64_01( FARPROC p, HB_U64 p01 ) { return ( ( WIN64_01 ) *p )( p01 ); }