From 840e83559a12538dfd9f3f2364aaf50e8069d196 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Fri, 6 Jan 2017 20:16:38 +0000 Subject: [PATCH] - reverted merge of r33363, as it depends on r32835, which was not merged git-svn-id: branches/fixes_3_0@35246 - --- compiler/msgtxt.inc | 2 +- rtl/win/sysutils.pp | 4 ++-- utils/fpcm/revision.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index df225fad3e..30da3b6d92 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1223,7 +1223,7 @@ const msgtxt : array[0..000310,1..240] of char=( 'le "$1"'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPC','DATE] for $F'+ 'PCCPU'#010+ - 'Copyright (c) 1993-2015 by Florian Klaempfl and others'#000+ + 'Copyright (c) 1993-2016 by Florian Klaempfl and others'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler date : $FPCDATE'#010+ diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp index 10c3973a09..6b6554d42b 100644 --- a/rtl/win/sysutils.pp +++ b/rtl/win/sysutils.pp @@ -1,4 +1,4 @@ -{ + { This file is part of the Free Pascal run time library. Copyright (c) 1999-2000 by Florian Klaempfl @@ -990,7 +990,7 @@ begin MaxMsgSize, { Maximum message size } nil); SysErrorMessage := MsgBuffer; - FreeMem(MsgBuffer, MaxMsgSize*2); + FreeMem(MsgBuffer, MaxMsgSize); end; {**************************************************************************** diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc index f55003022a..5fd7b85369 100644 --- a/utils/fpcm/revision.inc +++ b/utils/fpcm/revision.inc @@ -1 +1 @@ -'2016-04-05 rev 33425' +'2016-07-13 rev 34110'