diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a10256bbde..996f984487 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-14 08:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbdefs.h + * use native stdint.h for MSVC 2010. Patch by Andi, thx. + + * harbour/contrib/hbwin/hbwinole.h + * fixing __DMC__ compilation. Patch by Andi, thx. + + * harbour/contrib/hblzf/hblzf.c + * pacified warning + 2011-01-13 19:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbexpat/tests/test.prg * contrib/hbexpat/tests/tohash.prg diff --git a/harbour/contrib/hblzf/hblzf.c b/harbour/contrib/hblzf/hblzf.c index 3d6faa620b..fc250105d0 100644 --- a/harbour/contrib/hblzf/hblzf.c +++ b/harbour/contrib/hblzf/hblzf.c @@ -72,7 +72,7 @@ HB_FUNC( HB_LZF_COMPRESSBOUND ) { if( HB_ISCHAR( 1 ) || HB_ISNUM( 1 ) ) { - HB_SIZE nLen = HB_ISCHAR( 1 ) ? hb_parclen( 1 ) : hb_parns( 1 ); + HB_SIZE nLen = HB_ISCHAR( 1 ) ? hb_parclen( 1 ) : ( HB_SIZE ) hb_parns( 1 ); hb_retns( hb_lzf_compressbound( nLen ) ); } else @@ -119,7 +119,7 @@ HB_FUNC( HB_LZF_COMPRESS ) else { out_len = ( HB_ISNUM( 2 ) && hb_parns( 2 ) >= 0 ) ? - hb_parns( 2 ) : + ( HB_SIZE ) hb_parns( 2 ) : hb_lzf_compressbound( in_len ); out_data = ( char * ) hb_xalloc( out_len + 1 ); diff --git a/harbour/contrib/hbwin/hbwinole.h b/harbour/contrib/hbwin/hbwinole.h index 218c872385..dba6be1d51 100644 --- a/harbour/contrib/hbwin/hbwinole.h +++ b/harbour/contrib/hbwin/hbwinole.h @@ -124,6 +124,7 @@ */ #if defined( __cplusplus ) && !defined( CINTERFACE ) && \ ( defined( __BORLANDC__ ) || \ + defined( __DMC__ ) || \ defined( _MSC_VER ) || \ defined( __MINGW32__ ) || \ ( defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1270 ) ) ) diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 42fb4abb4b..e47c0a6812 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -64,6 +64,7 @@ #if defined( __XCC__ ) || defined( __POCC__ ) || defined( __LCC__ ) || \ defined( __MINGW32__ ) || defined( __DMC__ ) || \ + ( defined( _MSC_VER ) && _MSC_VER >= 1600 ) || \ ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 ) || \ ( defined( __WATCOMC__ ) && __WATCOMC__ >= 1270 ) || \ ( ( defined( __GNUC__ ) || defined( __SUNPRO_C ) || defined( __SUNPRO_CC ) ) && \