浏览代码

* Solved name conflict parser.inc is used in classes unit

git-svn-id: trunk@20880 -
michael 13 年之前
父节点
当前提交
fcb4bf4854
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      .gitattributes
  2. 0 0
      packages/libxml/src/libxmlparser.inc
  3. 4 4
      packages/libxml/src/xml2.inc

+ 1 - 1
.gitattributes

@@ -5038,10 +5038,10 @@ packages/libxml/src/encoding.inc svneol=native#text/plain
 packages/libxml/src/entities.inc svneol=native#text/plain
 packages/libxml/src/globals.inc svneol=native#text/plain
 packages/libxml/src/hash.inc svneol=native#text/plain
+packages/libxml/src/libxmlparser.inc svneol=native#text/plain
 packages/libxml/src/list.inc svneol=native#text/plain
 packages/libxml/src/nanoftp.inc svneol=native#text/plain
 packages/libxml/src/nanohttp.inc svneol=native#text/plain
-packages/libxml/src/parser.inc svneol=native#text/plain
 packages/libxml/src/parserInternals.inc svneol=native#text/plain
 packages/libxml/src/pattern.inc svneol=native#text/plain
 packages/libxml/src/relaxng.inc svneol=native#text/plain

+ 0 - 0
packages/libxml/src/parser.inc → packages/libxml/src/libxmlparser.inc


+ 4 - 4
packages/libxml/src/xml2.inc

@@ -22,7 +22,7 @@ type
   {$i pattern.inc}
   {$i schemasInternals.inc}
   {$i valid.inc}
-  {$i parser.inc}
+  {$i libxmlparser.inc}
   {$i parserInternals.inc}
   {$i schematron.inc}
   {$i threads.inc}
@@ -71,7 +71,7 @@ type
   {$i pattern.inc}
   {$i schemasInternals.inc}
   {$i valid.inc}
-  {$i parser.inc}
+  {$i libxmlparser.inc}
   {$i parserInternals.inc}
   {$i schematron.inc}
   {$i threads.inc}
@@ -121,7 +121,7 @@ const
   {$i schemasInternals.inc}
   {$i hash.inc}
   {$i valid.inc}
-  {$i parser.inc}
+  {$i libxmlparser.inc}
   {$i parserInternals.inc}
   {$i schematron.inc}
   {$i threads.inc}
@@ -170,7 +170,7 @@ const
   {$i schemasInternals.inc}
   {$i hash.inc}
   {$i valid.inc}
-  {$i parser.inc}
+  {$i libxmlparser.inc}
   {$i parserInternals.inc}
   {$i schematron.inc}
   {$i threads.inc}