From d39666bc6dfdde32bd7de9a019be3708011e2f50 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Sat, 25 May 2002 00:36:53 +0000 Subject: [PATCH] See ChangeLog entry 2002-05-24 20:30 UTC-0400 David G. Holm --- harbour/ChangeLog | 6 ++++++ harbour/contrib/libnf/dispc.c | 9 ++++++--- harbour/contrib/libnf/idle.c | 2 ++ harbour/source/rdd/dbf1.c | 2 +- harbour/source/rdd/dbfntx/dbfntx1.c | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index efda2af0ef..e99f223485 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2002-05-24 20:30 UTC-0400 David G. Holm + * source/rdd/dbf1.c + * contrib/libnf/dispc.c + * contrib/libnf/idle.c + ! Fixed some problems that caused C++ compiles to fail. + 2002-05-24 16:15 UTC-0300 Walter Negro * source/rtl/tgetlist.prg ! Corrected minor bug in using Len() on oGet:Buffer, diff --git a/harbour/contrib/libnf/dispc.c b/harbour/contrib/libnf/dispc.c index b948e9e8df..e8dccd864f 100644 --- a/harbour/contrib/libnf/dispc.c +++ b/harbour/contrib/libnf/dispc.c @@ -13,6 +13,9 @@ * Modification history: * --------------------- * + * Rev 1.8 24 May 2002 19:25:00 David G. Holm + * Fixed some problems that caused C++ compiles to fail. + * * Rev 1.7 29 Mar 2002 17:00:00 Walter Negro * Ported to Harbour * @@ -560,8 +563,8 @@ HB_FUNC( _FT_DFINIT ) maxlin = hb_parni(12); buffsize = hb_parni(13); /* yes - load value */ - buffer = hb_xalloc(buffsize); /* allocate memory */ - lbuff = hb_xalloc(maxlin + 1); /* for buffers */ + buffer = (char *) hb_xalloc(buffsize); /* allocate memory */ + lbuff = (char *) hb_xalloc(maxlin + 1); /* for buffers */ isallocated = !(buffer == NULL || lbuff == NULL || vseg == NULL); @@ -907,7 +910,7 @@ static int keyin() ch = 0; while ( ch == 0x00 ) /* check to see if it's extended */ { - ch = hb_inkeyTranslate( hb_gtReadKey( 0 ), 0); + ch = hb_inkeyTranslate( hb_gtReadKey( ( HB_inkey_enum ) 0 ), ( HB_inkey_enum ) 0); if (ch == 257) /* error compiling with bcc55 */ ch = 27; /* ESC with CapsLock ON = 257, with CapsLock OFF = 27 */ hb_idleState(); diff --git a/harbour/contrib/libnf/idle.c b/harbour/contrib/libnf/idle.c index 44cfebfab6..13de3847ca 100644 --- a/harbour/contrib/libnf/idle.c +++ b/harbour/contrib/libnf/idle.c @@ -14,6 +14,8 @@ * */ +#include "hbdefs.h" +#include "hbapi.h" /* $DOC$ * $FUNCNAME$ diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 640a01853a..05f60b82fd 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -1588,7 +1588,7 @@ ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) /* Create memo file */ if( bHasMemo ) { - unsigned char *tmp; + BYTE *tmp; ERRCODE result; pArea->szMemoFileName = ( char * ) hb_xgrab( _POSIX_PATH_MAX + 1 ); pFileName = hb_fsFNameSplit( ( char * ) pCreateInfo->abName ); diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 94f67b27ba..7abbf44027 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -1185,7 +1185,7 @@ static void hb_ntxPageSave( LPTAGINFO pTag, LPPAGEINFO pPage ) { ( ( LPNTXBUFFER ) pPage->buffer )->item_count = pPage->uiKeys; hb_fsSeek( pTag->Owner->DiskFile, pPage->Page, FS_SET ); - hb_fsWrite( pTag->Owner->DiskFile, (unsigned char *) pPage->buffer, NTXBLOCKSIZE ); + hb_fsWrite( pTag->Owner->DiskFile, (BYTE *) pPage->buffer, NTXBLOCKSIZE ); pPage->Changed = FALSE; } @@ -1250,7 +1250,7 @@ static LPPAGEINFO hb_ntxPageLoad( LPTAGINFO pTag, ULONG ulOffset ) pPage->Page = ulOffset; hb_fsSeek( pTag->Owner->DiskFile, ulOffset, FS_SET ); - if( hb_fsRead( pTag->Owner->DiskFile, (unsigned char *) pPage->buffer, NTXBLOCKSIZE ) + if( hb_fsRead( pTag->Owner->DiskFile, (BYTE *) pPage->buffer, NTXBLOCKSIZE ) != NTXBLOCKSIZE ) return NULL;