2009-07-28 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/hbsocket.h
* contrib/hbssl/hbssl.c
* source/rtl/hbsocket.c
* source/rtl/hbinet.c
* examples/uhttpd2/socket.c
* examples/httpsrv/socket.c
* HB_SOCKET_T -> HB_SOCKET
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* source/rtl/gtstd/gtstd.c
* source/rtl/filesys.c
* source/rtl/gtpca/gtpca.c
* source/rtl/gtwvt/gtwvt.c
! Added casts for msvc64.
Some C RTL functions in msvc64 expects file handles as 'int's.
The rest is some non-critical stuff.
Now only size_t to int/ULONG warnings remain in hbrtl.
; TOFIX: Plus these two:
../../../hbstrfmt.c(459) : warning C4244: 'argument' : conversion from '__int64' to 'ULONG', possible loss of data
../../../hbtoken.c(280) : warning C4244: '=' : conversion from '__int64' to 'ULONG', possible loss of data
This commit is contained in:
@@ -50,24 +50,22 @@ static int hb_parnidef( int iParam, int iValue )
|
||||
return HB_ISNUM( iParam ) ? hb_parni( iParam ) : iValue;
|
||||
}
|
||||
|
||||
static HB_SOCKET_T hb_parsocket( int iParam )
|
||||
static HB_SOCKET hb_parsocket( int iParam )
|
||||
{
|
||||
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET_T ) ( HB_PTRDIFF )
|
||||
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET ) ( HB_PTRDIFF )
|
||||
hb_parptr( iParam ) : HB_NO_SOCKET;
|
||||
}
|
||||
|
||||
static void hb_retsocket( HB_SOCKET_T hSocket )
|
||||
static void hb_retsocket( HB_SOCKET hSocket )
|
||||
{
|
||||
if( hSocket == HB_NO_SOCKET )
|
||||
hb_ret();
|
||||
else
|
||||
hb_retptr( ( void* ) ( HB_PTRDIFF ) hSocket );
|
||||
if( hSocket != HB_NO_SOCKET )
|
||||
hb_retptr( ( void * ) ( HB_PTRDIFF ) hSocket );
|
||||
}
|
||||
|
||||
static HB_SOCKET_T hb_itemGetSocket( PHB_ITEM pSocket )
|
||||
static HB_SOCKET hb_itemGetSocket( PHB_ITEM pSocket )
|
||||
{
|
||||
if( pSocket && HB_IS_POINTER( pSocket ) )
|
||||
return ( HB_SOCKET_T ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
|
||||
return ( HB_SOCKET ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
|
||||
else
|
||||
return HB_NO_SOCKET;
|
||||
}
|
||||
@@ -157,7 +155,7 @@ HB_FUNC( SOCKET_RECV )
|
||||
len = hb_parni( 3 );
|
||||
if( len <= 0 )
|
||||
len = 4096;
|
||||
pBuf = ( char* ) hb_xgrab( len + 1 );
|
||||
pBuf = ( char * ) hb_xgrab( len + 1 );
|
||||
len = hb_socketRecv( hb_parsocket( 1 ), pBuf, len, hb_parni( 4 ),
|
||||
HB_ISNUM( 5 ) ? hb_parnint( 5 ) : -1 );
|
||||
hb_retni( len );
|
||||
|
||||
Reference in New Issue
Block a user