fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-09-22 04:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/rtl/hbinet.c
    ! fixed typo in previous commit which broke MS-Win builds
    * check hb_vmReaquestQuery() after executing use codeblocks
This commit is contained in:
Przemyslaw Czerpak
2008-09-22 02:27:54 +00:00
parent b34b792443
commit 4be2b3ea73
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-22 04:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/hbinet.c
! fixed typo in previous commit which broke MS-Win builds
* check hb_vmReaquestQuery() after executing use codeblocks
2008-09-22 03:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbstack.h
* harbour/source/vm/estack.c

11
harbour/source/rtl/hbinet.c
View File

@@ -320,7 +320,7 @@ static int hb_selectWriteExceptSocket( HB_SOCKET_STRUCT *Socket )
if( Socket->timeout == -1 )
{
iResult = select( Socket->com + 1, NULL, &set, &eset, NULL ) < 0 )
iResult = select( Socket->com + 1, NULL, &set, &eset, NULL );
}
else
{
@@ -965,7 +965,8 @@ static void s_inetRecvInternal( int iMode )
hb_execFromArray( Socket->caPeriodic );
/* do we continue? */
if( ! hb_parl( -1 ) || ( Socket->timelimit != -1 && iTimeElapsed >= Socket->timelimit ) )
if( ! hb_parl( -1 ) || hb_vmRequestQuery() != 0 ||
( Socket->timelimit != -1 && iTimeElapsed >= Socket->timelimit ) )
{
HB_SOCKET_SET_ERROR2( Socket, -1, "Timeout" );
hb_retni( iReceived );
@@ -1088,7 +1089,7 @@ static void s_inetRecvPattern( const char *szPattern )
hb_vmLock();
hb_execFromArray( Socket->caPeriodic );
fResult = hb_parl( -1 );
fResult = hb_parl( -1 ) && hb_vmRequestQuery() == 0;
hb_vmUnlock();
/* do we continue? */
@@ -1285,7 +1286,7 @@ HB_FUNC( HB_INETRECVENDBLOCK )
hb_vmLock();
hb_execFromArray( Socket->caPeriodic );
fResult = hb_parl( -1 );
fResult = hb_parl( -1 ) && hb_vmRequestQuery() == 0;
hb_vmUnlock();
if( fResult &&
@@ -2145,7 +2146,7 @@ HB_FUNC( HB_INETDGRAMRECV )
hb_vmLock();
hb_execFromArray( Socket->caPeriodic );
/* do we continue? */
fRepeat = hb_parl( -1 ) &&
fRepeat = hb_parl( -1 ) && hb_vmRequestQuery() == 0 &&
( Socket->timelimit == -1 || iTimeElapsed < Socket->timelimit );
hb_vmUnlock();
}