From 22116ce9be0d1c46cfd6188e13c8e87ea84515d2 Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Wed, 13 Feb 2013 13:13:21 +0000
Subject: [PATCH] * Revert changes to java-related files by r23604.

git-svn-id: trunk@23606 -
---
 rtl/java/jcompproc.inc | 4 ++--
 rtl/java/jsystem.inc   | 4 ++--
 rtl/java/justrings.inc | 8 +++-----
 rtl/jvm/jvm.inc        | 7 -------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/rtl/java/jcompproc.inc b/rtl/java/jcompproc.inc
index 94cc7bfd64..2cedf74c91 100644
--- a/rtl/java/jcompproc.inc
+++ b/rtl/java/jcompproc.inc
@@ -639,12 +639,12 @@ procedure fpc_InitializeUnits; compilerproc;
 Procedure fpc_do_exit; compilerproc;
 Procedure fpc_lib_exit; 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_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}
 Procedure fpc_reset_typed(var f : TypedFile;Size : Longint); compilerproc;
diff --git a/rtl/java/jsystem.inc b/rtl/java/jsystem.inc
index ecb4410ffd..f749426152 100644
--- a/rtl/java/jsystem.inc
+++ b/rtl/java/jsystem.inc
@@ -1092,7 +1092,7 @@ begin
 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
   Internal function should ALWAYS call HandleError instead of RunError.
@@ -1358,7 +1358,7 @@ begin
 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
 (*
   if pointer(AssertErrorProc)<>nil then
diff --git a/rtl/java/justrings.inc b/rtl/java/justrings.inc
index b4a534a934..09feae4923 100644
--- a/rtl/java/justrings.inc
+++ b/rtl/java/justrings.inc
@@ -267,12 +267,10 @@ Function fpc_Char_To_UnicodeStr(const c : AnsiChar): UnicodeString; compilerproc
   Converts a AnsiChar to a UnicodeString;
 }
 var
-  str: JLString;
-  arr: array of jbyte;
+  arr: array[0..0] of ansichar;
 begin
-  setlength(arr,1);
-  arr[0]:=ord(c);
-  result:=JLString.create(arr,0,1);
+  arr[0]:=c;
+  widestringmanager.Ansi2UnicodeMoveProc(pansichar(@arr),DefaultSystemCodePage,result,1);
 end;
 
 
diff --git a/rtl/jvm/jvm.inc b/rtl/jvm/jvm.inc
index a588dc81e5..3d74ad2749 100644
--- a/rtl/jvm/jvm.inc
+++ b/rtl/jvm/jvm.inc
@@ -41,13 +41,6 @@ procedure fpc_cpuinit;
   end;
 
 
-{$define FPC_SYSTEM_HAS_GET_FRAME}
-function get_frame:pointer;
-  begin
-    result:=nil;
-  end;
-
-
 {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
 function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;
   begin