Преглед на файлове

* Avoid nameclash and fix compilation

git-svn-id: trunk@16189 -
michael преди 15 години
родител
ревизия
843ce22187
променени са 4 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      .gitattributes
  2. 0 0
      tests/test/units/fpcunit/resref2.inc
  3. 0 0
      tests/test/units/fpcunit/sllist2.inc
  4. 2 2
      tests/test/units/fpcunit/tcresref.pp

+ 2 - 2
.gitattributes

@@ -9668,9 +9668,9 @@ tests/test/units/dos/tversion.pp svneol=native#text/plain
 tests/test/units/fpcunit/fplists.pp svneol=native#text/plain
 tests/test/units/fpcunit/fplists.pp svneol=native#text/plain
 tests/test/units/fpcunit/gencomptest.dpr svneol=native#text/plain
 tests/test/units/fpcunit/gencomptest.dpr svneol=native#text/plain
 tests/test/units/fpcunit/lists.pp svneol=native#text/plain
 tests/test/units/fpcunit/lists.pp svneol=native#text/plain
-tests/test/units/fpcunit/resref.inc svneol=native#text/plain
+tests/test/units/fpcunit/resref2.inc svneol=native#text/plain
 tests/test/units/fpcunit/searchbuf.inc svneol=native#text/plain
 tests/test/units/fpcunit/searchbuf.inc svneol=native#text/plain
-tests/test/units/fpcunit/sllist.inc svneol=native#text/plain
+tests/test/units/fpcunit/sllist2.inc svneol=native#text/plain
 tests/test/units/fpcunit/tbucketlist.lpi svneol=native#text/plain
 tests/test/units/fpcunit/tbucketlist.lpi svneol=native#text/plain
 tests/test/units/fpcunit/tbucketlist.lpr svneol=native#text/plain
 tests/test/units/fpcunit/tbucketlist.lpr svneol=native#text/plain
 tests/test/units/fpcunit/tcbucketlist.pp svneol=native#text/plain
 tests/test/units/fpcunit/tcbucketlist.pp svneol=native#text/plain

+ 0 - 0
tests/test/units/fpcunit/resref.inc → tests/test/units/fpcunit/resref2.inc


+ 0 - 0
tests/test/units/fpcunit/sllist.inc → tests/test/units/fpcunit/sllist2.inc


+ 2 - 2
tests/test/units/fpcunit/tcresref.pp

@@ -74,8 +74,8 @@ type
 implementation
 implementation
 
 
 
 
-{$i sllist.inc}
-{$i resref.inc}
+{$i sllist2.inc}
+{$i resref2.inc}
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
   Auxiliary routines
   Auxiliary routines