From 625722055efe761f274c9b2747c15a2eaf00f1bb Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Wed, 18 Apr 2001 21:40:06 +0000 Subject: [PATCH] 2001-04-18 17:40 UTC-0400 David G. Holm --- harbour/ChangeLog | 13 +++++++++++++ harbour/source/rdd/dbf1.c | 4 ++-- harbour/source/rtl/gtos2/gtos2.c | 7 +++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f9b327237c..25b1c2f121 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +2001-04-18 17:40 UTC-0400 David G. Holm + + * source/rdd/dbf1.c + % Changed two (unsigned chr *) type overrides to (BYTE *), + because the function called requires a BYTE * parameter + when used with C++. + + * source/rtl/gtos2/gtos2.c + % Changed two (void *) type overrides to (PPVOID), because + the function called requires a PPVOID parameter when used + with C++. + % Added definition for KBDTRF_EXTENDED_CODE when using VAC++. + 2001-04-18 22:30 CET Martin Vogel + contrib/libct/ctflist.txt ! function status list, only functions in the CVS are marked 'R' or 'S' ! diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index a503a8bdb4..f536abbee8 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -2480,7 +2480,7 @@ ERRCODE hb_dbfDrop( PHB_ITEM pItemTable ) strcpy( (char *) szFileName, (char *) pBuffer ); if ( !strchr( szFileName, '.' )) strcat( szFileName, DBF_TABLEEXT ); - return hb_fsDelete( (unsigned char *) szFileName ); + return hb_fsDelete( (BYTE *) szFileName ); } /* returns 1 if exists, 0 else */ @@ -2493,7 +2493,7 @@ BOOL hb_dbfExists( PHB_ITEM pItemTable, PHB_ITEM pItemIndex ) strcpy( (char *) szFileName, (char *) pBuffer ); if ( pItemTable && !strchr( szFileName, '.' )) strcat( szFileName, DBF_TABLEEXT ); - return hb_fsFile( (unsigned char *) szFileName ); + return hb_fsFile( (BYTE *) szFileName ); } diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c index 72ea256c00..0a2dc34891 100644 --- a/harbour/source/rtl/gtos2/gtos2.c +++ b/harbour/source/rtl/gtos2/gtos2.c @@ -105,6 +105,9 @@ #include #else #include + #ifndef KBDTRF_EXTENDED_CODE + #define KBDTRF_EXTENDED_CODE 0x02 + #endif #endif #include @@ -149,14 +152,14 @@ void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr ) } /* Alloc tileable memory for calling a 16 subsystem */ - rc = DosAllocMem((void *) &s_hk, sizeof(HKBD), PAG_COMMIT | OBJ_TILE | PAG_WRITE); + rc = DosAllocMem((PPVOID) &s_hk, sizeof(HKBD), PAG_COMMIT | OBJ_TILE | PAG_WRITE); if (rc != NO_ERROR) { hb_errInternal( HB_EI_XGRABALLOC, "hb_gt_ReadKey() memory allocation failure", NULL, NULL); } /* it is a long after all, so I set it to zero only one time since it never changes */ memset(s_hk, 0, sizeof(HKBD)); - rc = DosAllocMem((void *) &s_key, sizeof(KBDKEYINFO), PAG_COMMIT | OBJ_TILE | PAG_WRITE); + rc = DosAllocMem((PPVOID) &s_key, sizeof(KBDKEYINFO), PAG_COMMIT | OBJ_TILE | PAG_WRITE); if (rc != NO_ERROR) { hb_errInternal( HB_EI_XGRABALLOC, "hb_gt_ReadKey() memory allocation failure", NULL, NULL); }