paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 19:11:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Revert changes to java-related files by r23604.

Browse Source 
git-svn-id: trunk@23606 -
This commit is contained in:
yury 2013-02-13 13:13:21 +00:00
parent 4758d513de
commit 22116ce9be
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/java/jcompproc.inc
View File

@ -639,12 +639,12 @@ procedure fpc_InitializeUnits; compilerproc;
Procedure fpc_do_exit; compilerproc; Procedure fpc_do_exit; compilerproc;
Procedure fpc_lib_exit; compilerproc; Procedure fpc_lib_exit; compilerproc;
Procedure fpc_HandleErrorAddrFrame (Errno : longint;addr,frame : pointer); compilerproc; Procedure fpc_HandleErrorAddrFrame (Errno : longint;addr,frame : pointer); compilerproc;
Procedure fpc_HandleError (Errno : longint); compilerproc;
} }
Procedure fpc_HandleError (Errno : longint); compilerproc;
procedure fpc_AbstractErrorIntern;compilerproc; procedure fpc_AbstractErrorIntern;compilerproc;
*) *)
procedure fpc_assert(Const Msg,FName:unicodestring;LineNo:Longint{;ErrorAddr:Pointer}); compilerproc; procedure fpc_assert(Const Msg,FName:unicodestring;LineNo:Longint;ErrorAddr:Pointer); compilerproc;
{$ifdef FPC_HAS_FEATURE_FILEIO} {$ifdef FPC_HAS_FEATURE_FILEIO}
Procedure fpc_reset_typed(var f : TypedFile;Size : Longint); compilerproc; Procedure fpc_reset_typed(var f : TypedFile;Size : Longint); compilerproc;

4
rtl/java/jsystem.inc
View File

@ -1092,7 +1092,7 @@ begin
end; end;
Procedure HandleError (Errno : longint);[public,alias : 'FPC_HANDLEERROR']; Procedure fpc_handleerror (Errno : longint); compilerproc; [public,alias : 'FPC_HANDLEERROR'];
{ {
Procedure to handle internal errors, i.e. not user-invoked errors Procedure to handle internal errors, i.e. not user-invoked errors
Internal function should ALWAYS call HandleError instead of RunError. Internal function should ALWAYS call HandleError instead of RunError.
@ -1358,7 +1358,7 @@ begin
end; end;
Procedure fpc_assert(Const Msg,FName:unicodestring;LineNo:Longint{;ErrorAddr:Pointer}); [Public,Alias : 'FPC_ASSERT']; compilerproc; Procedure fpc_assert(Const Msg,FName:unicodestring;LineNo:Longint;ErrorAddr:Pointer); [Public,Alias : 'FPC_ASSERT']; compilerproc;
begin begin
(* (*
if pointer(AssertErrorProc)<>nil then if pointer(AssertErrorProc)<>nil then

8
rtl/java/justrings.inc
View File

@ -267,12 +267,10 @@ Function fpc_Char_To_UnicodeStr(const c : AnsiChar): UnicodeString; compilerproc
Converts a AnsiChar to a UnicodeString; Converts a AnsiChar to a UnicodeString;
} }
var var
str: JLString; arr: array[0..0] of ansichar;
arr: array of jbyte;
begin begin
setlength(arr,1); arr[0]:=c;
arr[0]:=ord(c); widestringmanager.Ansi2UnicodeMoveProc(pansichar(@arr),DefaultSystemCodePage,result,1);
result:=JLString.create(arr,0,1);
end; end;

7
rtl/jvm/jvm.inc
View File

@ -41,13 +41,6 @@ procedure fpc_cpuinit;
end; end;
{$define FPC_SYSTEM_HAS_GET_FRAME}
function get_frame:pointer;
begin
result:=nil;
end;
{$define FPC_SYSTEM_HAS_GET_CALLER_ADDR} {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer; function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;
begin begin