From 995c1f2ac83065e2b61f301edc6675b3edfaed66 Mon Sep 17 00:00:00 2001 From: Andi Jahja Date: Fri, 28 Dec 2001 22:04:58 +0000 Subject: [PATCH] Andi Jahja --- harbour/ChangeLog | 14 ++++++++++++++ harbour/include/hbapi.h | 2 +- harbour/source/vm/extend.c | 2 +- harbour/source/vm/maindll.c | 6 +++--- harbour/source/vm/maindllh.c | 4 ++-- harbour/source/vm/maindllp.c | 4 ++-- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7c38b56ff6..4ce3bef388 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,20 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ +2001-12-28 23:30 UTC+0700 Andi Jahja + IMPORTANT: For those who get duplicate defines when compiling + Win32 code, the #define HB_OS_WIN_32_USED should be defined + somewhere before including clipdefs.h. + +2001-12-28 18:54 UTC+0100 Patrick Mast + * contrib/apollo + + added readme.txt + * contrib/apollo/test + + bld.bat + + bld_b32.bat + * updated apollo.prg + +2001-12-28 13:28 UTC+0100 Patrick Mast + contrib/apollo * Started Apollo SDE60.DLL connection for accessing SIXNSX database files diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index b2c32f38d5..0ed6630eda 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -274,7 +274,7 @@ typedef USHORT ERRCODE; extern HB_SYMB hb_symEval; /* Extend API */ -extern char * hb_parc( int iParam, ... ); /* retrieve a string parameter */ +extern char HB_EXPORT * hb_parc( int iParam, ... ); /* retrieve a string parameter */ extern ULONG hb_parclen( int iParam, ... ); /* retrieve a string parameter length */ extern ULONG hb_parcsiz( int iParam, ... ); /* retrieve a by-reference string parameter length, including terminator */ extern char * hb_pards( int iParam, ... ); /* retrieve a date as a string yyyymmdd */ diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index 96b098d42c..443698f7a2 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -131,7 +131,7 @@ BOOL HB_EXPORT hb_extIsArray( int iParam ) /* NOTE: Caller should not modify the buffer returned by this function. [vszakats] */ -char * HB_EXPORT hb_parc( int iParam, ... ) +char HB_EXPORT * hb_parc( int iParam, ... ) { HB_TRACE(HB_TR_DEBUG, ("hb_parc(%d, ...)", iParam)); diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c index c77fe45766..01628864bb 100644 --- a/harbour/source/vm/maindll.c +++ b/harbour/source/vm/maindll.c @@ -62,7 +62,7 @@ #if defined(HB_OS_WIN_32) -BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) +BOOL HB_EXPORT WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) { HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason, pvReserved ) ); @@ -85,11 +85,11 @@ BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID return TRUE; } -LONG PASCAL HB_EXPORT HBDLLENTRY( char * cProcName ) +LONG HB_EXPORT PASCAL HBDLLENTRY( char * cProcName ) { hb_itemDoC( cProcName, 0, 0 ); return 0; } -#endif \ No newline at end of file +#endif diff --git a/harbour/source/vm/maindllh.c b/harbour/source/vm/maindllh.c index 9a54ebaf2e..f5be8ec28f 100644 --- a/harbour/source/vm/maindllh.c +++ b/harbour/source/vm/maindllh.c @@ -62,7 +62,7 @@ #if defined(HB_OS_WIN_32) -BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) +BOOL HB_EXPORT WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) { HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason, pvReserved ) ); @@ -83,4 +83,4 @@ BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID return TRUE; } -#endif \ No newline at end of file +#endif diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c index cd7a852afa..6ea8060252 100644 --- a/harbour/source/vm/maindllp.c +++ b/harbour/source/vm/maindllp.c @@ -72,7 +72,7 @@ typedef char * ( * EXT_PARC2 ) ( int iParam, ULONG ulArrayIndex ); #if defined(HB_OS_WIN_32) -BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) +BOOL HB_EXPORT WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ) { HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason, pvReserved ) ); @@ -147,4 +147,4 @@ char * hb_parc( int iParam, ... ) return ""; } -#endif \ No newline at end of file +#endif