From 2a774d62e8684f4ed592dad1dff35ac717579852 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 7 Jul 2008 18:17:21 +0000 Subject: [PATCH] 2008-07-07 20:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/xhb/xhbfunc.c ! Changed hb_ArrayID() to be in sync with xhb, and at the same time fixing the Win64 compatibility issue. Thanks Przemek. * ChangeLog ! Typo. --- harbour/ChangeLog | 11 ++++++++++- harbour/contrib/xhb/xhbfunc.c | 5 +---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9e3e64d49d..c92e78bbcf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,11 +8,20 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-07 20:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/xhb/xhbfunc.c + ! Changed hb_ArrayID() to be in sync with xhb, and at the + same time fixing the Win64 compatibility issue. + Thanks Przemek. + + * ChangeLog + ! Typo. + 2008-07-07 19:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/vm/arrayshb.c * contrib/xhb/xhbfunc.c ! Moved hb_ArrayID() Harbour level function to xhb.lib. - ; NOTE: This function is not compatible with x64 architecture. + ; NOTE: This function is not compatible with Win64 architecture. 2008-07-07 19:00 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * make_xmingwce.mak diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c index ef6368730e..5f1b5fdb87 100644 --- a/harbour/contrib/xhb/xhbfunc.c +++ b/harbour/contrib/xhb/xhbfunc.c @@ -126,10 +126,7 @@ HB_FUNC( HB_ARRAYID ) /* for debugging: returns the array's "address" so dual r { PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); - if( pArray ) - hb_retnl( ( long ) hb_arrayId( pArray ) ); - else - hb_retnl( -1 ); + hb_retptr( pArray ? hb_arrayId( pArray ) : NULL ); } /* Hash utem functions */