From 86e239eef6a753f37b875573453fb055b39538ef Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 11 Oct 2011 14:54:55 +0000 Subject: [PATCH] 2011-10-11 16:54 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbmk2/hbmk2.prg * added -CP437 to BCC switches * harbour/contrib/hbwin/olecore.c * pacified warning --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbwin/olecore.c | 4 ++-- harbour/utils/hbmk2/hbmk2.prg | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6775e25999..cf5554ea9a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-10-11 16:54 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/utils/hbmk2/hbmk2.prg + * added -CP437 to BCC switches + + * harbour/contrib/hbwin/olecore.c + * pacified warning + 2011-10-11 01:56 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/natmsg.c ! fixed typo in recent commit diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index fb254ba173..b9a41ad0da 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -1216,7 +1216,7 @@ HB_BOOL hb_oleDispInvoke( PHB_SYMB pSym, PHB_ITEM pObject, PHB_ITEM pParam, /* IDispatch parameters, return value handling */ -static void GetParams( DISPPARAMS * dispparam, HB_USHORT uiOffset, HB_BOOL fUseRef ) +static void GetParams( DISPPARAMS * dispparam, HB_UINT uiOffset, HB_BOOL fUseRef ) { VARIANTARG *pArgs = NULL, *pRefs; UINT uiArgCount, uiArg, uiRefs; @@ -1263,7 +1263,7 @@ static void GetParams( DISPPARAMS * dispparam, HB_USHORT uiOffset, HB_BOOL fUseR dispparam->cNamedArgs = 0; } -static void PutParams( DISPPARAMS * dispparam, HB_USHORT uiOffset, HB_USHORT uiClass ) +static void PutParams( DISPPARAMS * dispparam, HB_UINT uiOffset, HB_USHORT uiClass ) { VARIANTARG* pRefs = &dispparam->rgvarg[ dispparam->cArgs ]; PHB_ITEM pItem = NULL; diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 50fe6bd06f..e42a027af3 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -4261,7 +4261,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cOptIncMask := "-I{DI}" cBin_CompC := "bcc32.exe" cBin_CompCPP := cBin_CompC - cOpt_CompC := "-c -q" + cOpt_CompC := "-c -q -CP437" IF hbmk[ _HBMK_lOPTIM ] cOpt_CompC += " -d -6 -O2 -OS -Ov -Oi -Oc" ENDIF