paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-31 16:31:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

* renamed java-specific compproc.inc to jcompproc.inc to prevent timestamp

Browse Source 
conflicts when the compiler finds inc/compproc.inc while compiling other
   units later on

git-svn-id: branches/jvmbackend@19828 -
This commit is contained in:
Jonas Maebe 2011-12-12 02:34:04 +00:00
parent af9934cb6c
commit 0e65d01274
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -7355,11 +7355,11 @@ rtl/inc/wstrings.inc svneol=native#text/plain
rtl/inc/wustrings.inc svneol=native#text/plain rtl/inc/wustrings.inc svneol=native#text/plain
rtl/java/Makefile svneol=native#text/plain rtl/java/Makefile svneol=native#text/plain
rtl/java/Makefile.fpc 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/jastringh.inc svneol=native#text/plain
rtl/java/jastrings.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_sys.inc svneol=native#text/plain
rtl/java/java_sysh.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.inc svneol=native#text/plain
rtl/java/jdk15.pas svneol=native#text/plain rtl/java/jdk15.pas svneol=native#text/plain
rtl/java/jdynarr.inc svneol=native#text/plain rtl/java/jdynarr.inc svneol=native#text/plain

0
rtl/java/compproc.inc → rtl/java/jcompproc.inc
View File

2
rtl/java/jsystemh.inc
View File

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