diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5ee83513b7..1b47bc57cb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-18 11:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/filesys.c + ! fixed OpenWatcom Linux builds which does not support utimes() yet. + + * harbour/contrib/rddads/ads1.c + * pacified two BCC warnings + 2009-05-18 09:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/rddsql/sddmy/mysqldd.c * contrib/rddsql/sddpg/pgsqldd.c diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 0aeddbf6eb..8fbe1b33d1 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -2875,7 +2875,7 @@ static HB_ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo ) pArea->uiRecordLen = (USHORT) u32Length; /* Alloc record buffer - because it's also used for some extended types conversion it has to be at least 25 bytes size */ - pArea->pRecord = ( BYTE * ) hb_xgrab( HB_MAX( pArea->uiRecordLen, pArea->maxFieldLen ) + 1 ); + pArea->pRecord = ( BYTE * ) hb_xgrab( HB_MAX( ( ULONG ) pArea->uiRecordLen, pArea->maxFieldLen ) + 1 ); return SELF_GOTOP( ( AREAP ) pArea ); } @@ -3335,7 +3335,7 @@ static HB_ERRCODE adsOpen( ADSAREAP pArea, LPDBOPENINFO pOpenInfo ) pArea->uiRecordLen = (USHORT) u32Length; /* Alloc record buffer - because it's also used for some extended types conversion it has to be at least 25 bytes size */ - pArea->pRecord = ( BYTE * ) hb_xgrab( HB_MAX( pArea->uiRecordLen, pArea->maxFieldLen ) + 1 ); + pArea->pRecord = ( BYTE * ) hb_xgrab( HB_MAX( ( ULONG ) pArea->uiRecordLen, pArea->maxFieldLen ) + 1 ); /* If successful call SUPER_OPEN to finish system jobs */ if( SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ) == HB_FAILURE ) diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 263b9451b3..292cd0a26f 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -122,7 +122,7 @@ #include #include #include - #if defined( HB_OS_LINUX ) + #if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) #include #endif #endif @@ -1236,7 +1236,7 @@ BOOL hb_fsSetFileTime( BYTE * pszFileName, LONG lJulian, LONG lMillisec ) # else new_value = *gmtime( &tim ); # endif -#if defined( HB_OS_LINUX ) +#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) { struct timeval times[2]; times[ 0 ].tv_sec = times[ 1 ].tv_sec = mktime( &new_value );