From 0e65d012748d1523a4d4963acb1c89c09f3b7ae5 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 12 Dec 2011 02:34:04 +0000 Subject: [PATCH] * 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 - --- .gitattributes | 2 +- rtl/java/{compproc.inc => jcompproc.inc} | 0 rtl/java/jsystemh.inc | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename rtl/java/{compproc.inc => jcompproc.inc} (100%) diff --git a/.gitattributes b/.gitattributes index ab4e687f75..31d03497f8 100644 --- a/.gitattributes +++ b/.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 diff --git a/rtl/java/compproc.inc b/rtl/java/jcompproc.inc similarity index 100% rename from rtl/java/compproc.inc rename to rtl/java/jcompproc.inc diff --git a/rtl/java/jsystemh.inc b/rtl/java/jsystemh.inc index 26a45387c4..d1dc48ce6e 100644 --- a/rtl/java/jsystemh.inc +++ b/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} {*****************************************************************************