diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-01 11:32:05 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-01 11:32:05 +0000 |
| commit | 5d25729969df02d0516219060d71b8c191ffb047 (patch) | |
| tree | b3dca4c601a0895d536f661594c5f44ef2b599ac | |
| parent | 88605298ec67adc6f266add3057a6a18187f6f9b (diff) | |
| download | fpc-5d25729969df02d0516219060d71b8c191ffb047.tar.gz | |
--- 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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37098 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/iconvenc/src/iconvenc.pas | 2 | ||||
| -rw-r--r-- | packages/iconvenc/src/iconvenc_dyn.pas | 2 | ||||
| -rw-r--r-- | packages/iconvenc/src/iconvert.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/iconvenc/src/iconvenc.pas b/packages/iconvenc/src/iconvenc.pas index e0aac343c5..9780ac7d78 100644 --- a/packages/iconvenc/src/iconvenc.pas +++ b/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 diff --git a/packages/iconvenc/src/iconvenc_dyn.pas b/packages/iconvenc/src/iconvenc_dyn.pas index 57aad86c11..a97927d0ba 100644 --- a/packages/iconvenc/src/iconvenc_dyn.pas +++ b/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 diff --git a/packages/iconvenc/src/iconvert.inc b/packages/iconvenc/src/iconvert.inc index 8707b123b2..d4428a8cf6 100644 --- a/packages/iconvenc/src/iconvert.inc +++ b/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; |