From 37cc2dae647dc00da95cb8e0da3f4dff1debe0c7 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 2 Dec 2007 03:33:17 +0000 Subject: [PATCH] 2007-12-02 04:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbdefs.h * harbour/source/rdd/hsx/hsx.c * harbour/source/rdd/dbfcdx/dbfcdx1.c * harbour/source/hbpcre/ChangeLog * harbour/source/hbpcre/pcrecomp.c * minor modifications to pacify some MSVC warnings --- harbour/ChangeLog | 8 ++++++++ harbour/include/hbdefs.h | 4 ++-- harbour/source/hbpcre/ChangeLog | 4 ++++ harbour/source/hbpcre/pcrecomp.c | 6 +----- harbour/source/rdd/dbfcdx/dbfcdx1.c | 2 +- harbour/source/rdd/hsx/hsx.c | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cfb33a94bc..f5799c0663 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-02 04:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbdefs.h + * harbour/source/rdd/hsx/hsx.c + * harbour/source/rdd/dbfcdx/dbfcdx1.c + * harbour/source/hbpcre/ChangeLog + * harbour/source/hbpcre/pcrecomp.c + * minor modifications to pacify some MSVC warnings + 2007-12-02 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/mouse53.c * do not include unnecessary header files diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 24d59b7e19..22bdb05b80 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -737,7 +737,7 @@ typedef unsigned long HB_COUNTER; double dbl; \ BYTE buffer[ 8 ]; \ } u; \ - u.dbl = ( d ); \ + u.dbl = ( double ) ( d ); \ (( BYTE * )( p ))[ 7 ] = u.buffer[ 0 ]; \ (( BYTE * )( p ))[ 6 ] = u.buffer[ 1 ]; \ (( BYTE * )( p ))[ 5 ] = u.buffer[ 2 ]; \ @@ -753,7 +753,7 @@ typedef unsigned long HB_COUNTER; double dbl; \ BYTE buffer[ 8 ]; \ } u; \ - u.dbl = ( d ); \ + u.dbl = ( double ) ( d ); \ (( BYTE * )( p ))[ 0 ] = u.buffer[ 0 ]; \ (( BYTE * )( p ))[ 1 ] = u.buffer[ 1 ]; \ (( BYTE * )( p ))[ 2 ] = u.buffer[ 2 ]; \ diff --git a/harbour/source/hbpcre/ChangeLog b/harbour/source/hbpcre/ChangeLog index 1d7d1b9394..63f043e45b 100644 --- a/harbour/source/hbpcre/ChangeLog +++ b/harbour/source/hbpcre/ChangeLog @@ -18,6 +18,10 @@ * */ +2007-12-02 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/hbpcre/pcrecomp.c + * minor modification to pacify MSVC warnings + 2007-05-31 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/hbpcre/pcredfa.c * harbour/source/hbpcre/pcreexec.c diff --git a/harbour/source/hbpcre/pcrecomp.c b/harbour/source/hbpcre/pcrecomp.c index ae4084bfd3..fd78102d10 100644 --- a/harbour/source/hbpcre/pcrecomp.c +++ b/harbour/source/hbpcre/pcrecomp.c @@ -531,12 +531,8 @@ else in future, so I haven't "optimized" it. */ default: - if ((options & PCRE_EXTRA) != 0) switch(c) - { - default: + if ((options & PCRE_EXTRA) != 0) *errorcodeptr = ERR3; - break; - } break; } } diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 37acb145ed..89daa7d586 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -2346,7 +2346,7 @@ static void hb_cdxPageStore( LPCDXPAGE pPage ) else if ( pPage->iKeys > pPage->TagParent->MaxKeys ) hb_cdxErrInternal( "hb_cdxPageStore: number of keys exceed!." ); #endif - HB_PUT_LE_UINT16( pPage->node.intNode.attr, pPage->PageType ); + HB_PUT_LE_UINT16( pPage->node.intNode.attr, ( UINT16 ) pPage->PageType ); HB_PUT_LE_UINT16( pPage->node.intNode.nKeys, pPage->iKeys ); HB_PUT_LE_UINT32( pPage->node.intNode.leftPtr, pPage->Left ); HB_PUT_LE_UINT32( pPage->node.intNode.rightPtr, pPage->Right ); diff --git a/harbour/source/rdd/hsx/hsx.c b/harbour/source/rdd/hsx/hsx.c index 24287ef477..eeb5e3448c 100644 --- a/harbour/source/rdd/hsx/hsx.c +++ b/harbour/source/rdd/hsx/hsx.c @@ -621,8 +621,8 @@ static int hb_hsxHdrFlush( int iHandle ) uiBits++; HB_PUT_LE_UINT32( pHeader->recCount, pHSX->ulRecCount ); - HB_PUT_LE_UINT32( pHeader->recSize, pHSX->uiRecordSize ); - HB_PUT_LE_UINT32( pHeader->recSizeBits, uiBits ); + HB_PUT_LE_UINT32( pHeader->recSize, ( UINT32 ) pHSX->uiRecordSize ); + HB_PUT_LE_UINT32( pHeader->recSizeBits, ( UINT32 ) uiBits ); HB_PUT_LE_UINT16( pHeader->ignoreCase, pHSX->fIgnoreCase ? 1 : 0 ); HB_PUT_LE_UINT16( pHeader->filterType, pHSX->iFilterType ); HB_PUT_LE_UINT32( pHeader->hashLetters, pHSX->fUseHash ? 1 : 0 );