Browse Source

* moved general system includes accidentally put in jdynarr.inc to
system.pp

git-svn-id: branches/jvmbackend@18835 -

Jonas Maebe 14 years ago
parent
commit
56e724cea6
2 changed files with 12 additions and 14 deletions
  1. 0 14
      rtl/java/jdynarr.inc
  2. 12 0
      rtl/java/system.pp

+ 0 - 14
rtl/java/jdynarr.inc

@@ -16,20 +16,6 @@
 }
 
 
-function min(a,b : longint) : longint;
-  begin
-     if a<=b then
-       min:=a
-     else
-       min:=b;
-  end;
-
-
-{$i jrec.inc}
-{$i jset.inc}
-{$i jpvar.inc}
-{$i jsystem.inc}
-
 { copying helpers }
 
 procedure fpc_copy_shallow_array(src, dst: JLObject; srcstart: jint = -1; srccopylen: jint = -1);

+ 12 - 0
rtl/java/system.pp

@@ -96,8 +96,20 @@ const
                                  implementation
 {*****************************************************************************}
 
+function min(a,b : longint) : longint;
+  begin
+     if a<=b then
+       min:=a
+     else
+       min:=b;
+  end;
+
 {$i jtvar.inc}
+{$i jrec.inc}
+{$i jset.inc}
+{$i jpvar.inc}
 {$i jdynarr.inc}
+{$i jsystem.inc}
 
 {*****************************************************************************
                        Misc. System Dependent Functions