diff --git a/rtl/java/jcompproc.inc b/rtl/java/jcompproc.inc index f6dadc9989..bb29e6afc9 100644 --- a/rtl/java/jcompproc.inc +++ b/rtl/java/jcompproc.inc @@ -447,8 +447,8 @@ Procedure fpc_textinit_iso(var t : Text;nr : DWord);compilerproc; Procedure fpc_textclose_iso(var t : Text);compilerproc; Procedure fpc_Write_End(var f:Text); compilerproc; Procedure fpc_Writeln_End(var f:Text); compilerproc; -Procedure fpc_Write_Text_ShortStr(Len : Longint;var f : Text;const s : String); compilerproc; -Procedure fpc_Write_Text_ShortStr_Iso(Len : Longint;var f : Text;const s : String); compilerproc; +Procedure fpc_Write_Text_ShortStr(Len : Longint;var f : Text;const s : ShortString); compilerproc; +Procedure fpc_Write_Text_ShortStr_Iso(Len : Longint;var f : Text;const s : ShortString); compilerproc; Procedure fpc_Write_Text_Pchar_as_Array(Len : Longint;var f : Text;const s : array of AnsiChar; zerobased: boolean = true); compilerproc; Procedure fpc_Write_Text_Pchar_as_Array_Iso(Len : Longint;var f : Text;const s : array of AnsiChar; zerobased: boolean = true); compilerproc; Procedure fpc_Write_Text_PChar_As_Pointer(Len : Longint;var f : Text;p : PAnsiChar); compilerproc; @@ -545,7 +545,7 @@ procedure fpc_dispinvoke_variant(dest : pvardata;var source : tvardata; calldes Procedure fpc_Read_End(var f:Text); compilerproc; Procedure fpc_ReadLn_End(var f : Text); compilerproc; Procedure fpc_ReadLn_End_Iso(var f : Text); compilerproc; -Procedure fpc_Read_Text_ShortStr(var f : Text;out s : String); compilerproc; +Procedure fpc_Read_Text_ShortStr(var f : Text;out s : ShortString); compilerproc; Procedure fpc_Read_Text_PChar_As_Pointer(var f : Text; const s : PAnsiChar); compilerproc; Procedure fpc_Read_Text_PChar_As_Array(var f : Text;out s : array of AnsiChar; zerobased: boolean = false); compilerproc; {$ifdef FPC_HAS_FEATURE_ANSISTRINGS} diff --git a/rtl/java/jsystemh.inc b/rtl/java/jsystemh.inc index 7e7f9df3d3..f9b4f6dd4c 100644 --- a/rtl/java/jsystemh.inc +++ b/rtl/java/jsystemh.inc @@ -679,7 +679,7 @@ Function SeekEOLn:Boolean; Function SeekEOF:Boolean; Procedure SetTextBuf(var f:Text; var Buf);[INTERNPROC:fpc_in_settextbuf_file_x]; Procedure SetTextBuf(var f:Text; var Buf; Size:SizeInt); -Procedure SetTextLineEnding(var f:Text; Ending:string); +Procedure SetTextLineEnding(var f:Text; Ending:Shortstring); function GetTextCodePage(var T: Text): TSystemCodePage; procedure SetTextCodePage(var T: Text; CodePage: TSystemCodePage); {$endif FPC_HAS_FEATURE_TEXTIO} @@ -817,7 +817,7 @@ Const Procedure Error(RunTimeError : TRunTimeError); {$ifdef FPC_HAS_FEATURE_COMMANDARGS} Function Paramcount:Longint; -Function ParamStr(l:Longint):string; +Function ParamStr(l:Longint):Shortstring; {$endif FPC_HAS_FEATURE_COMMANDARGS} {$ifndef JVM}