From 0a2ccc50f1e91b1b2f59cfc3d0d7f45155d5aebe Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 30 Jun 2009 16:04:36 +0000 Subject: [PATCH] 2009-06-30 18:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbtypes.h * harbour/source/vm/maindllp.c * cleaned prototype names for hb_vmProcessSymbols() and hb_vmExecute() --- harbour/ChangeLog | 5 +++++ harbour/include/hbtypes.h | 6 ++---- harbour/source/vm/maindllp.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4900ba5bfa..b761458b6a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-30 18:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbtypes.h + * harbour/source/vm/maindllp.c + * cleaned prototype names for hb_vmProcessSymbols() and hb_vmExecute() + 2009-06-30 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/postinst.bat * Force English language hbmk2 in Harbour build. diff --git a/harbour/include/hbtypes.h b/harbour/include/hbtypes.h index 276370b8f9..e4e1ef90b1 100644 --- a/harbour/include/hbtypes.h +++ b/harbour/include/hbtypes.h @@ -62,13 +62,11 @@ HB_EXTERN_BEGIN -typedef PHB_SYMB ( * VM_PROCESS_DLL_SYMBOLS ) ( PHB_SYMB pModuleSymbols, - USHORT uiModuleSymbols ); -typedef PHB_SYMB ( * VM_PROCESS_SYMBOLS_EX ) +typedef PHB_SYMB ( * VM_PROCESS_SYMBOLS ) ( PHB_SYMB pModuleSymbols, USHORT uiModuleSymbols, const char * szModuleName, ULONG ulID, USHORT uiPcodeVer ); -typedef void ( * VM_DLL_EXECUTE ) ( const BYTE * pCode, PHB_SYMB pSymbols ); +typedef void ( * VM_EXECUTE ) ( const BYTE * pCode, PHB_SYMB pSymbols ); typedef BOOL ( * EXT_IS_ARRAY ) ( int iParam ); typedef char * ( * EXT_PARC1 ) ( int iParam ); diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c index ced761d818..90427356e6 100644 --- a/harbour/source/vm/maindllp.c +++ b/harbour/source/vm/maindllp.c @@ -156,7 +156,7 @@ PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols, const char * s_pProcessSymbols = hb_getProcAddress( HBTEXT( "_hb_vmProcessDynLibSymbols" ) ); if( s_pProcessSymbols ) - return ( ( VM_PROCESS_SYMBOLS_EX ) s_pProcessSymbols ) + return ( ( VM_PROCESS_SYMBOLS ) s_pProcessSymbols ) ( pSymbols, uiSymbols, szModuleName, ulID, uiPcodeVer ); /* else * may we issue an error ? */ @@ -173,7 +173,7 @@ void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols ) s_pExecute = hb_getProcAddress( HBTEXT( "_hb_vmExecute" ) ); if( s_pExecute ) - ( ( VM_DLL_EXECUTE ) s_pExecute )( pCode, pSymbols ); + ( ( VM_EXECUTE ) s_pExecute )( pCode, pSymbols ); /* else * may we issue an error ? */