From 4d67360c09080868f0600873732f5d6165dcd01d Mon Sep 17 00:00:00 2001 From: Miguel Angel Marchuet Frutos Date: Fri, 5 Sep 2008 12:01:56 +0000 Subject: [PATCH] * source/rtl/hbinet.c ! Fixed return value of HB_INETGETSNDBUFSIZE --- harbour/contrib/hbbmcdx/bmdbfcdx.c | 6 ++++-- harbour/source/rtl/hbinet.c | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/harbour/contrib/hbbmcdx/bmdbfcdx.c b/harbour/contrib/hbbmcdx/bmdbfcdx.c index 0eea628c78..67258f37f9 100644 --- a/harbour/contrib/hbbmcdx/bmdbfcdx.c +++ b/harbour/contrib/hbbmcdx/bmdbfcdx.c @@ -4040,7 +4040,8 @@ static BOOL hb_cdxPageReadPrevKey( LPCDXPAGE pPage ) break; } } - while( !hb_cdxCheckRecordScope( pPage->TagParent->pIndex->pArea, + while( ( pPage->TagParent->OptFlags & CDX_TYPE_STRUCTURE ) == 0 && + !hb_cdxCheckRecordScope( pPage->TagParent->pIndex->pArea, hb_cdxPageGetKeyRec( pPage, pPage->iCurKey ) ) ); if( pPage->iCurKey != 0 ) hb_cdxSetCurKey( pPage ); @@ -4083,7 +4084,8 @@ static BOOL hb_cdxPageReadNextKey( LPCDXPAGE pPage ) break; } } - while( !hb_cdxCheckRecordScope( pPage->TagParent->pIndex->pArea, + while( ( pPage->TagParent->OptFlags & CDX_TYPE_STRUCTURE ) == 0 && + !hb_cdxCheckRecordScope( pPage->TagParent->pIndex->pArea, hb_cdxPageGetKeyRec( pPage, pPage->iCurKey ) ) ); if( pPage->iCurKey != 0 ) hb_cdxSetCurKey( pPage ); diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c index b34a426dcc..7f8b109925 100644 --- a/harbour/source/rtl/hbinet.c +++ b/harbour/source/rtl/hbinet.c @@ -214,9 +214,9 @@ #endif #if (__POCC__ >= 500) && defined( HB_OS_WIN_64 ) - /* TOFIX: Bad workaround for the '__WSAFDIsSet unresolved' problem - in Pelles C 5.00.13 AMD64 mode, to make final executables - link at all. Some hbinet.c features (or the whole module) + /* TOFIX: Bad workaround for the '__WSAFDIsSet unresolved' problem + in Pelles C 5.00.13 AMD64 mode, to make final executables + link at all. Some hbinet.c features (or the whole module) won't properly work though. [vszakats] */ #undef FD_ISSET #define FD_ISSET( s, f ) ( 0 ) @@ -808,6 +808,7 @@ HB_FUNC( HB_INETGETSNDBUFSIZE ) #else getsockopt( Socket->com, SOL_SOCKET, SO_SNDBUF, ( void * ) &value, &len ); #endif + hb_retni( value ); } }