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

2009-07-28 10:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/rtl/hbsocket.c
    ! fixed timeout updating in non Linux builds

  * harbour/mpkg_rpm.sh
    ! test 'gd-devel' version number not 'gd'
This commit is contained in:
Przemyslaw Czerpak
2009-07-28 08:46:02 +00:00
parent 71b32fe18b
commit 8b0a2e6ba8
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-28 10:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/hbsocket.c
! fixed timeout updating in non Linux builds
* harbour/mpkg_rpm.sh
! test 'gd-devel' version number not 'gd'
2009-07-28 10:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.cf
* config/globsh.cf

2
harbour/mpkg_rpm.sh
View File

@@ -104,7 +104,7 @@ then
fi
if test_reqrpm "gd-devel"
then
v=`rpm -q gd|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"`
v=`rpm -q gd-devel|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"`
[ "$v" -ge 2 ] && INST_PARAM="${INST_PARAM} --with gd"
fi
if test_reqrpm "unixodbc-devel" || test_reqrpm "unixODBC-devel"

3
harbour/source/rtl/hbsocket.c
View File

@@ -1189,6 +1189,7 @@ static int hb_socketSelectRD( HB_SOCKET_T sd, HB_LONG timeout )
if( timecurr > timer )
{
timeout -= timecurr - timer;
timer = timecurr;
if( timeout > 0 )
continue;
}
@@ -1236,6 +1237,7 @@ static int hb_socketSelectWR( HB_SOCKET_T sd, HB_LONG timeout )
if( timecurr > timer )
{
timeout -= timecurr - timer;
timer = timecurr;
if( timeout > 0 )
continue;
}
@@ -1297,6 +1299,7 @@ static int hb_socketSelectWRE( HB_SOCKET_T sd, HB_LONG timeout )
if( timecurr > timer )
{
timeout -= timecurr - timer;
timer = timecurr;
if( timeout > 0 )
continue;
}