浏览代码

* renamed java-specific compproc.inc to jcompproc.inc to prevent timestamp
conflicts when the compiler finds inc/compproc.inc while compiling other
units later on

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

Jonas Maebe 13 年之前
父节点
当前提交
0e65d01274
共有 3 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      .gitattributes
  2. 0 0
      rtl/java/jcompproc.inc
  3. 1 1
      rtl/java/jsystemh.inc

+ 1 - 1
.gitattributes

@@ -7355,11 +7355,11 @@ rtl/inc/wstrings.inc svneol=native#text/plain
 rtl/inc/wustrings.inc svneol=native#text/plain
 rtl/java/Makefile svneol=native#text/plain
 rtl/java/Makefile.fpc svneol=native#text/plain
-rtl/java/compproc.inc svneol=native#text/plain
 rtl/java/jastringh.inc svneol=native#text/plain
 rtl/java/jastrings.inc svneol=native#text/plain
 rtl/java/java_sys.inc svneol=native#text/plain
 rtl/java/java_sysh.inc svneol=native#text/plain
+rtl/java/jcompproc.inc svneol=native#text/plain
 rtl/java/jdk15.inc svneol=native#text/plain
 rtl/java/jdk15.pas svneol=native#text/plain
 rtl/java/jdynarr.inc svneol=native#text/plain

+ 0 - 0
rtl/java/compproc.inc → rtl/java/jcompproc.inc


+ 1 - 1
rtl/java/jsystemh.inc

@@ -760,7 +760,7 @@ const
 
 { documenting compiler proc. is useless, they shouldn't be used by the user anyways }
 {$ifndef fpdocsystem}
-{$i compproc.inc}
+{$i jcompproc.inc}
 {$endif fpdocsystem}
 
 {*****************************************************************************