Fix compilation after r33958.

git-svn-id: trunk@33969 -

packages/libxml/src/catalog.inc

@@ -22,16 +22,14 @@
  *
  * The namespace for the XML Catalogs elements.
  *)
-  __XML_CATALOGS_NAMESPACE: String = 'urn:oasis:names:tc:entity:xmlns:xml:catalog';
-  XML_CATALOGS_NAMESPACE: xmlCharPtr = @__XML_CATALOGS_NAMESPACE[1];
+  XML_CATALOGS_NAMESPACE: xmlCharPtr = 'urn:oasis:names:tc:entity:xmlns:xml:catalog';
 
 (**
  * XML_CATALOG_PI:
  *
  * The specific XML Catalog Processing Instuction name.
  *)
-  __XML_CATALOG_PI: String = 'urn:oasis:names:tc:entity:xmlns:xml:catalog';
-  XML_CATALOG_PI: xmlCharPtr = @__XML_CATALOG_PI[1];
+  XML_CATALOG_PI: xmlCharPtr = 'urn:oasis:names:tc:entity:xmlns:xml:catalog';
 {$ENDIF}
 
 {$IFDEF POINTER}

packages/libxml/src/tree.inc

@@ -56,16 +56,14 @@
  * This is the namespace for the special xml: prefix predefined in the
  * XML Namespace specification.
  *)
-  __LIBXML_XML_NAMESPACE: String = 'http://www.w3.org/XML/1998/namespace';
-  LIBXML_XML_NAMESPACE: xmlCharPtr = @__LIBXML_XML_NAMESPACE[1];
+  LIBXML_XML_NAMESPACE: xmlCharPtr = 'http://www.w3.org/XML/1998/namespace';
 
 (**
  * XML_XML_ID:
  *
  * This is the name for the special xml:id attribute
  *)
-  __LIBXML_XML_ID: String = 'xml:id';
-  LIBXML_XML_ID: xmlCharPtr = @__LIBXML_XML_ID[1];
+  LIBXML_XML_ID: xmlCharPtr = 'xml:id';
 {$ENDIF}
 
 {$IFDEF TYPE}

packages/libxml/src/xinclude.inc

@@ -18,71 +18,61 @@
  *
  * Macro defining the Xinclude namespace: http://www.w3.org/2003/XInclude
  *)
-  __XINCLUDE_NS: String = 'http://www.w3.org/2003/XInclude';
-  XINCLUDE_NS: xmlCharPtr = @__XINCLUDE_NS[1];
+  XINCLUDE_NS: xmlCharPtr = 'http://www.w3.org/2003/XInclude';
 (**
  * XINCLUDE_OLD_NS:
  *
  * Macro defining the draft Xinclude namespace: http://www.w3.org/2001/XInclude
  *)
-  __XINCLUDE_OLD_NS: String = 'http://www.w3.org/2001/XInclude';
-  XINCLUDE_OLD_NS: xmlCharPtr = @__XINCLUDE_OLD_NS[1];
+  XINCLUDE_OLD_NS: xmlCharPtr = 'http://www.w3.org/2001/XInclude';
 (**
  * XINCLUDE_NODE:
  *
  * Macro defining "include"
  *)
-  __XINCLUDE_NODE: String = 'include';
-  XINCLUDE_NODE: xmlCharPtr = @__XINCLUDE_NODE[1];
+  XINCLUDE_NODE: xmlCharPtr = 'include';
 (**
  * XINCLUDE_FALLBACK:
  *
  * Macro defining "fallback"
  *)
-  __XINCLUDE_FALLBACK: String = 'fallback';
-  XINCLUDE_FALLBACK: xmlCharPtr = @__XINCLUDE_FALLBACK[1];
+  XINCLUDE_FALLBACK: xmlCharPtr = 'fallback';
 (**
  * XINCLUDE_HREF:
  *
  * Macro defining "href"
  *)
-  __XINCLUDE_HREF: String = 'href';
-  XINCLUDE_HREF: xmlCharPtr = @__XINCLUDE_HREF[1];
+  XINCLUDE_HREF: xmlCharPtr = 'href';
 (**
  * XINCLUDE_PARSE:
  *
  * Macro defining "parse"
  *)
-  __XINCLUDE_PARSE: String = 'parse';
-  XINCLUDE_PARSE: xmlCharPtr = @__XINCLUDE_PARSE[1];
+  XINCLUDE_PARSE: xmlCharPtr = 'parse';
 (**
  * XINCLUDE_PARSE_XML:
  *
  * Macro defining "xml"
  *)
-  __XINCLUDE_PARSE_XML: String = 'xml';
-  XINCLUDE_PARSE_XML: xmlCharPtr = @__XINCLUDE_PARSE_XML[1];
+  XINCLUDE_PARSE_XML: xmlCharPtr = 'xml';
 (**
  * XINCLUDE_PARSE_TEXT:
  *
  * Macro defining "text"
  *)
-  __XINCLUDE_PARSE_TEXT: String = 'text';
-  XINCLUDE_PARSE_TEXT: xmlCharPtr = @__XINCLUDE_PARSE_TEXT[1];
+  XINCLUDE_PARSE_TEXT: xmlCharPtr = 'text';
 (**
  * XINCLUDE_PARSE_ENCODING:
  *
  * Macro defining "encoding"
  *)
-  __XINCLUDE_PARSE_ENCODING: String = 'encoding';
-  XINCLUDE_PARSE_ENCODING: xmlCharPtr = @__XINCLUDE_PARSE_ENCODING[1];
+  XINCLUDE_PARSE_ENCODING: xmlCharPtr = 'encoding';
 (**
  * XINCLUDE_PARSE_XPOINTER:
  *
  * Macro defining "xpointer"
  *)
-  __XINCLUDE_PARSE_XPOINTER: String = 'xpointer';
-  XINCLUDE_PARSE_XPOINTER: xmlCharPtr = @__XINCLUDE_PARSE_XPOINTER[1];
+  XINCLUDE_PARSE_XPOINTER: xmlCharPtr = 'xpointer';
 {$ENDIF}
 
 {$IFDEF POINTER}