2009-10-20 21:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/rddads/adsfunc.c
  * contrib/rddads/rddads.h
  * contrib/rddads/ads1.c
    ! Fixed fatal errors for 64-bit builds. I don't if there exist 
      a 64-bit version of ACE, but anyway.
This commit is contained in:
Viktor Szakats
2009-10-20 19:36:34 +00:00
parent ed9cd3fc9e
commit cce12eb9e7
4 changed files with 14 additions and 7 deletions

View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-20 21:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/rddads/adsfunc.c
* contrib/rddads/rddads.h
* contrib/rddads/ads1.c
! Fixed fatal errors for 64-bit builds. I don't if there exist
a 64-bit version of ACE, but anyway.
2009-10-20 13:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/vm/thread.c
* harbour/include/hbthread.h

View File

@@ -2687,7 +2687,7 @@ static HB_ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo )
ADSHANDLE hTable, hConnection;
UNSIGNED32 uRetVal, u32Length, uiFldLen, uiLen;
UNSIGNED8 *ucfieldDefs, *ucfieldPtr;
UNSIGNED8 ucBuffer[MAX_STR_LEN + 1];
UNSIGNED8 ucBuffer[ MAX_STR_LEN + 1 ];
USHORT uiCount;
LPFIELD pField;
const char * cType;
@@ -2824,7 +2824,7 @@ static HB_ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo )
if( uiFldLen == 0 )
{
uiFldLen = strlen( ( char * ) ucBuffer ); /* should have been set by hb_snprintf above. */
uiFldLen = ( UNSIGNED32 ) strlen( ( char * ) ucBuffer ); /* should have been set by hb_snprintf above. */
}
if( uiFldLen >= uiLen )
{

View File

@@ -1685,7 +1685,7 @@ HB_FUNC( ADSCONNECT60 )
{
hb_ads_hConnect = hConnect; /* set new default */
hb_stornl( hConnect, 6 );
hb_stornint( hConnect, 6 );
hb_retl( TRUE );
}

View File

@@ -182,10 +182,10 @@ typedef ADSAREA * ADSAREAP;
# undef ADS_USE_OEM_TRANSLATION
#endif
#define HB_ADS_PARCONNECTION( n ) ( ISNUM( n ) ? ( ADSHANDLE ) hb_parnl( n ) : hb_ads_hConnect )
#define HB_ADS_RETCONNECTION( h ) hb_retnl( h )
#define HB_ADS_GETCONNECTION( p ) ( ( hb_itemType( p ) & HB_IT_NUMERIC ) ? ( ADSHANDLE ) hb_itemGetNL( p ) : hb_ads_hConnect )
#define HB_ADS_PUTCONNECTION( p, h ) hb_itemPutNL( ( p ), ( LONG ) ( h ) )
#define HB_ADS_PARCONNECTION( n ) ( ISNUM( n ) ? ( ADSHANDLE ) hb_parnint( n ) : hb_ads_hConnect )
#define HB_ADS_RETCONNECTION( h ) hb_retnint( h )
#define HB_ADS_GETCONNECTION( p ) ( ( hb_itemType( p ) & HB_IT_NUMERIC ) ? ( ADSHANDLE ) hb_itemGetNInt( p ) : hb_ads_hConnect )
#define HB_ADS_PUTCONNECTION( p, h ) hb_itemPutNInt( ( p ), ( HB_PTRDIFF ) ( h ) )
#define HB_ADS_DEFCONNECTION( v ) ( ( v ) ? ( ADSHANDLE ) ( v ) : hb_ads_hConnect )
extern int hb_ads_iFileType; /* current global setting */