paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 13:09:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r36139 into '.':

Browse Source 
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 -
This commit is contained in:
marco 2017-09-01 11:32:05 +00:00
parent 7f492f796f
commit eb73f4a0ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/iconvenc/src/iconvenc.pas
View File

@ -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

2
packages/iconvenc/src/iconvenc_dyn.pas
View File

@ -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

2
packages/iconvenc/src/iconvert.inc
View File

@ -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;