Browse Source

- reverted merge of r33363, as it depends on r32835, which was not merged

git-svn-id: branches/fixes_3_0@35246 -
Jonas Maebe 8 years ago
parent
commit
840e83559a
3 changed files with 4 additions and 4 deletions
  1. 1 1
      compiler/msgtxt.inc
  2. 2 2
      rtl/win/sysutils.pp
  3. 1 1
      utils/fpcm/revision.inc

+ 1 - 1
compiler/msgtxt.inc

@@ -1223,7 +1223,7 @@ const msgtxt : array[0..000310,1..240] of char=(
   'le "$1"'#000+
   'le "$1"'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPC','DATE] for $F'+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPC','DATE] for $F'+
   'PCCPU'#010+
   '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+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   #010+
   'Compiler date      : $FPCDATE'#010+
   'Compiler date      : $FPCDATE'#010+

+ 2 - 2
rtl/win/sysutils.pp

@@ -1,4 +1,4 @@
-{
+         {
 
 
     This file is part of the Free Pascal run time library.
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by Florian Klaempfl
     Copyright (c) 1999-2000 by Florian Klaempfl
@@ -990,7 +990,7 @@ begin
                  MaxMsgSize,                           { Maximum message size }
                  MaxMsgSize,                           { Maximum message size }
                  nil);
                  nil);
   SysErrorMessage := MsgBuffer;
   SysErrorMessage := MsgBuffer;
-  FreeMem(MsgBuffer, MaxMsgSize*2);
+  FreeMem(MsgBuffer, MaxMsgSize);
 end;
 end;
 
 
 {****************************************************************************
 {****************************************************************************

+ 1 - 1
utils/fpcm/revision.inc

@@ -1 +1 @@
-'2016-04-05 rev 33425'
+'2016-07-13 rev 34110'