From b0a88e24ff478c35b9572b8a5a041eb3e7e278e2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 14 Oct 2008 22:32:03 +0000 Subject: [PATCH] 2008-10-15 00:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbxvm.h * harbour/source/vm/hvm.c - removed to unused functions * harbour/source/vm/thread.c - removed unnecessary casting --- harbour/ChangeLog | 8 ++++++++ harbour/include/hbxvm.h | 2 -- harbour/source/vm/hvm.c | 11 +---------- harbour/source/vm/thread.c | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e69182ef74..23e2450e7c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-15 00:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbxvm.h + * harbour/source/vm/hvm.c + - removed to unused functions + + * harbour/source/vm/thread.c + - removed unnecessary casting + 2008-10-14 20:36 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/dbedit.prg * source/rtl/tgetint.prg diff --git a/harbour/include/hbxvm.h b/harbour/include/hbxvm.h index 7da7ddeed7..00a3e2c49a 100644 --- a/harbour/include/hbxvm.h +++ b/harbour/include/hbxvm.h @@ -254,8 +254,6 @@ extern HB_EXPORT BOOL hb_xvmLocalAdd( int iLocal ); extern HB_EXPORT BOOL hb_xvmStaticAdd( USHORT uiStatic ); extern HB_EXPORT BOOL hb_xvmMemvarAdd( PHB_SYMB pSymbol ); -extern HB_EXPORT PHB_ITEM hb_xvmStaticPtr( int iStatic ); -extern HB_EXPORT PHB_ITEM hb_xvmLocalPtr( int iLocal ); extern HB_EXPORT void hb_xvmCopyLocals( int iDest, int iSource ); HB_EXTERN_END diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index a1f37fa74e..3edcc73dc4 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -8479,7 +8479,7 @@ HB_EXPORT void hb_xvmPopLocal( SHORT iLocal ) hb_vmPopLocal( iLocal ); } -HB_EXPORT PHB_ITEM hb_xvmLocalPtr( int iLocal ) +static PHB_ITEM hb_xvmLocalPtr( int iLocal ) { HB_STACK_TLS_PRELOAD @@ -8499,15 +8499,6 @@ HB_EXPORT PHB_ITEM hb_xvmLocalPtr( int iLocal ) } } -HB_EXPORT PHB_ITEM hb_xvmStaticPtr( int iStatic ) -{ - HB_STACK_TLS_PRELOAD - - HB_TRACE(HB_TR_DEBUG, ("hb_xvmStaticPtr(%d)", iStatic)); - - return s_aStatics.item.asArray.value->pItems + hb_stackGetStaticsBase() + iStatic - 1; -} - HB_EXPORT void hb_xvmCopyLocals( int iDest, int iSource ) { PHB_ITEM pDest; diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c index 72767a02ba..1b3f96d453 100644 --- a/harbour/source/vm/thread.c +++ b/harbour/source/vm/thread.c @@ -729,13 +729,13 @@ HB_FUNC( HB_THREADID ) { pThread = hb_thParam( 1, 0 ); if( pThread ) - hb_retnint( ( HB_PTRDIFF ) pThread->th_no ); + hb_retnint( pThread->th_no ); } else { pThread = ( PHB_THREADSTATE ) hb_vmThreadState(); if( pThread ) - hb_retnint( ( HB_PTRDIFF ) pThread->th_no ); + hb_retnint( pThread->th_no ); else hb_retnint( 0 ); }