--- Merging r36139 into '.':

U    packages/iconvenc/src/iconvenc_dyn.pas
U    packages/iconvenc/src/iconvert.inc
U    packages/iconvenc/src/iconvenc.pas
--- Recording mergeinfo for merge of r36139 into '.':
 U   .

# revisions: 36139

git-svn-id: branches/fixes_3_0@37098 -

packages/iconvenc/src/iconvenc.pas

@@ -72,7 +72,7 @@ function iconv_close (__cd: iconv_t): cint; cdecl; external libiconvname name ic
 var
   IconvLibFound: boolean = False;
 
-function Iconvert(s: string; var res: string; FromEncoding, ToEncoding: string): cint;
+function Iconvert(s: string; var res: string; const  FromEncoding, ToEncoding: string): cint;
 function InitIconv(var error: string): boolean;
 
 implementation

packages/iconvenc/src/iconvenc_dyn.pas

@@ -47,7 +47,7 @@ var
   IconvLibFound: boolean = False;
 
 function TryLoadLib(LibName: string; var error: string): boolean; // can be used to load non standard libname
-function Iconvert(s: string; var res: string; FromEncoding, ToEncoding: string): cint;
+function Iconvert(s: string; var res: string; const FromEncoding, ToEncoding: string): cint;
 function InitIconv(var error: string): boolean;
 
 implementation

packages/iconvenc/src/iconvert.inc

@@ -3,7 +3,7 @@
  {$define noerrnoiconv}
 {$endif}
 
-function Iconvert(S: string; var Res: string; FromEncoding, ToEncoding: string): cint;
+function Iconvert(S: string; var Res: string; const FromEncoding, ToEncoding: string): cint;
 var
   InLen, OutLen, Offset: size_t;
   Src, Dst: pchar;