From 8ecb3adf406174090f103153bc2e8a61a6ce8577 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Fri, 10 Jun 2005 08:02:47 +0000
Subject: [PATCH] Merged revisions 141 via svnmerge from /trunk

git-svn-id: branches/fixes_2_0@368 -
---
 compiler/cutils.pas  |  4 ++--
 compiler/widestr.pas | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/cutils.pas b/compiler/cutils.pas
index bba7735611..9364b9f7c5 100644
--- a/compiler/cutils.pas
+++ b/compiler/cutils.pas
@@ -82,7 +82,7 @@ interface
     {# Returns true if value is a power of 2, the actual
        exponent value is returned in power.
     }
-    function ispowerof2(value : int64;var power : longint) : boolean;
+    function ispowerof2(value : int64;out power : longint) : boolean;
     function backspace_quote(const s:string;const qchars:Tcharset):string;
     function octal_quote(const s:string;const qchars:Tcharset):string;
     function maybequoted(const s:string):string;
@@ -616,7 +616,7 @@ uses
       end;
 
 
-    function ispowerof2(value : int64;var power : longint) : boolean;
+    function ispowerof2(value : int64;out power : longint) : boolean;
     {
       return if value is a power of 2. And if correct return the power
     }
diff --git a/compiler/widestr.pas b/compiler/widestr.pas
index 242161f9ab..da57074510 100644
--- a/compiler/widestr.pas
+++ b/compiler/widestr.pas
@@ -23,6 +23,8 @@
 }
 unit widestr;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses
@@ -41,8 +43,8 @@ unit widestr;
           maxlen,len : SizeInt;
        end;
 
-    procedure initwidestring(var r : pcompilerwidestring);
-    procedure donewidestring(var r : pcompilerwidestring);
+    procedure initwidestring(out r : pcompilerwidestring);
+    procedure donewidestring(out r : pcompilerwidestring);
     procedure setlengthwidestring(r : pcompilerwidestring;l : SizeInt);
     function getlengthwidestring(r : pcompilerwidestring) : SizeInt;
     procedure concatwidestringchar(r : pcompilerwidestring;c : tcompilerwidechar);
@@ -63,7 +65,7 @@ unit widestr;
        globals;
 
 
-    procedure initwidestring(var r : pcompilerwidestring);
+    procedure initwidestring(out r : pcompilerwidestring);
 
       begin
          new(r);
@@ -72,7 +74,7 @@ unit widestr;
          r^.maxlen:=0;
       end;
 
-    procedure donewidestring(var r : pcompilerwidestring);
+    procedure donewidestring(out r : pcompilerwidestring);
 
       begin
          if assigned(r^.data) then