From 31f9b025603dc3aeb7b16ea21f475652e9b42506 Mon Sep 17 00:00:00 2001 From: marc Date: Sat, 3 Nov 2007 02:41:12 +0000 Subject: [PATCH] * fixed compilation on fpc 2.0.4 git-svn-id: trunk@12711 - --- components/codetools/fileprocs.pas | 8 ++++++++ lcl/lclproc.pas | 6 +++--- lcl/menus.pp | 1 - 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/components/codetools/fileprocs.pas b/components/codetools/fileprocs.pas index 5fa15fd762..a8c44f98a6 100644 --- a/components/codetools/fileprocs.pas +++ b/components/codetools/fileprocs.pas @@ -1883,7 +1883,15 @@ begin vtQWord: DbgOut(dbgs(Args[i].VQWord^)); vtBoolean: DbgOut(dbgs(Args[i].vboolean)); vtExtended: DbgOut(dbgs(Args[i].VExtended^)); +{$if defined(FPC_CURRENCY_IS_INT64) and defined(VER2_0)} + // MWE: + // ppcppc 2.0.x has troubles in choosing the right dbgs() + // so we convert here + // (precicion not added, since dbgs here has no presicion) + vtCurrency: DbgOut(dbgs(int64(Args[i].vCurrency^)/10000 {, 4})); +{$else} vtCurrency: DbgOut(dbgs(Args[i].vCurrency^)); +{$endif} vtString: DbgOut(Args[i].VString^); vtAnsiString: DbgOut(AnsiString(Args[i].VAnsiString)); vtChar: DbgOut(Args[i].VChar); diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index f20cc3bb2f..13e3821b37 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -1329,10 +1329,10 @@ begin vtQWord: DbgOut(dbgs(Args[i].VQWord^)); vtBoolean: DbgOut(dbgs(Args[i].vboolean)); vtExtended: DbgOut(dbgs(Args[i].VExtended^)); -{$ifdef FPC_CURRENCY_IS_INT64} +{$if defined(FPC_CURRENCY_IS_INT64) and defined(VER2_0)} // MWE: - // ppcppc 2.0.2 has troubles in choosing the right dbgs() - // so we convert here (i don't know about other versions + // ppcppc 2.0.x has troubles in choosing the right dbgs() + // so we convert here vtCurrency: DbgOut(dbgs(int64(Args[i].vCurrency^)/10000, 4)); {$else} vtCurrency: DbgOut(dbgs(Args[i].vCurrency^)); diff --git a/lcl/menus.pp b/lcl/menus.pp index 9087c0a815..cf68e94a94 100644 --- a/lcl/menus.pp +++ b/lcl/menus.pp @@ -330,7 +330,6 @@ type public constructor Create(AOwner: TComponent); override; published - property Items; property OnChange; end;