* PChar -> PAnsichar

packages/libxml/examples/exutils.pas

@@ -24,7 +24,7 @@ var
 begin
   mem := nil;
   xmlDocDumpMemory(doc, mem, size);
-  writeln(pchar(mem));
+  writeln(PAnsiChar(mem));
   xmlFree(mem);
 end;
 

packages/libxml/examples/io1.pas

@@ -22,7 +22,7 @@ uses
   SysUtils;
 
 const
-  include: pchar =
+  include: PAnsiChar =
     '<?xml version=''1.0''?>'#10+
     '<document xmlns:xi="http://www.w3.org/2003/XInclude">'#10+
       '<p>List of people:</p>'#10+
@@ -30,8 +30,8 @@ const
     '</document>'#10;
 
 var
-  res: pchar = '<list><people>a</people><people>b</people></list>';
-  cur: pchar = nil;
+  res: PAnsiChar = '<list><people>a</people><people>b</people></list>';
+  cur: PAnsiChar = nil;
   rlen: cint = 0;
 
 
@@ -43,7 +43,7 @@ var
  *
  * Returns 1 if yes and 0 if another Input module should be used
  *)
-function sqlMatch(URI: pchar): cint; cdecl;
+function sqlMatch(URI: PAnsiChar): cint; cdecl;
 begin
   if assigned(URI) and (strlcomp(URI, 'sql:', 4) = 0) then
     result := 1
@@ -60,7 +60,7 @@ end;
  *
  * Returns an Input context or NULL in case or error
  *)
-function sqlOpen(URI: pchar): pointer; cdecl;
+function sqlOpen(URI: PAnsiChar): pointer; cdecl;
 begin
   if not assigned(URI) or (strlcomp(URI, 'sql:', 4) <> 0) then
     exit(nil);
@@ -100,9 +100,9 @@ end;
  *
  * Returns the number of bytes read or -1 in case of error
  *)
-function sqlRead(context: pointer; buffer: pchar; len: cint): cint; cdecl;
+function sqlRead(context: pointer; buffer: PAnsiChar; len: cint): cint; cdecl;
 var
-  ptr: pchar;
+  ptr: PAnsiChar;
 begin
   if not assigned(context) or not assigned(buffer) or (len < 0) then
     exit(-1);

packages/libxml/examples/io2.pas

@@ -1,6 +1,6 @@
 (**
  * section: InputOutput
- * synopsis: Output to char buffer
+ * synopsis: Output to AnsiChar buffer
  * purpose: Demonstrate the use of xmlDocDumpMemory
  *          to output document to a character buffer
  * usage: io2

packages/libxml/examples/reader1.pas

@@ -58,7 +58,7 @@ end;
  *
  * Parse and print information about an XML file.
  *)
-procedure streamFile(const filename: pchar);
+procedure streamFile(const filename: PAnsiChar);
 var
   reader: xmlTextReaderPtr;
   ret: cint;
@@ -88,7 +88,7 @@ begin
    *)
   LIBXML_TEST_VERSION;
 
-  streamFile(pchar(ParamStr(1)));
+  streamFile(PAnsiChar(ParamStr(1)));
 
   (*
    * Cleanup function for the XML library.

packages/libxml/examples/reader2.pas

@@ -33,7 +33,7 @@ var
 begin
   name := xmlTextReaderConstName(reader);
   if not assigned(name) then
-    name := pchar('--'); // BAD_CAST !!!!
+    name := PAnsiChar('--'); // BAD_CAST !!!!
 
   value := xmlTextReaderConstValue(reader);
 
@@ -59,7 +59,7 @@ end;
  *
  * Parse and print information about an XML file.
  *)
-procedure streamFile(const filename: pchar);
+procedure streamFile(const filename: PAnsiChar);
 var
   reader: xmlTextReaderPtr;
   ret: cint;
@@ -104,7 +104,7 @@ begin
    *)
   LIBXML_TEST_VERSION;
 
-  streamFile(pchar(ParamStr(1)));
+  streamFile(PAnsiChar(ParamStr(1)));
 
   (*
    * Cleanup function for the XML library.

packages/libxml/examples/tree1.pas

@@ -52,7 +52,7 @@ begin
   LIBXML_TEST_VERSION;
 
   (* parse the file and get the DOM *)
-  doc := xmlReadFile(pchar(paramStr(1)), nil, 0);
+  doc := xmlReadFile(PAnsiChar(paramStr(1)), nil, 0);
 
   if not assigned(doc) then
   begin

packages/libxml/examples/tree2.pas

@@ -22,7 +22,7 @@ var
   doc: xmlDocPtr;
   root_node, node, node1: xmlNodePtr;
   dtd: xmlDtdPtr;
-  buff: array[0..255] of char;
+  buff: array[0..255] of AnsiChar;
   i, j: cint;
 
 begin

packages/libxml/src/HTMLparser.inc

@@ -36,15 +36,15 @@
  * and XHTML 1.0 (which share the same structure).
  *)
   htmlElemDesc = record
-    name        : pchar;	(* The tag name *)
-    startTag    : char;      (* Whether the start tag can be implied *)
-    endTag      : char;        (* Whether the end tag can be implied *)
-    saveEndTag  : char;    (* Whether the end tag should be saved *)
-    empty       : char;         (* Is this an empty element ? *)
-    depr        : char;          (* Is this a deprecated element ? *)
-    dtd         : char;           (* 1: only in Loose DTD, 2: only Frameset one *)
-    isinline    : char;      (* is this a block 0 or inline 1 element *)
-    desc        : pchar;   (* the description *)
+    name        : PAnsiChar;	(* The tag name *)
+    startTag    : AnsiChar;      (* Whether the start tag can be implied *)
+    endTag      : AnsiChar;        (* Whether the end tag can be implied *)
+    saveEndTag  : AnsiChar;    (* Whether the end tag should be saved *)
+    empty       : AnsiChar;         (* Is this an empty element ? *)
+    depr        : AnsiChar;          (* Is this a deprecated element ? *)
+    dtd         : AnsiChar;           (* 1: only in Loose DTD, 2: only Frameset one *)
+    isinline    : AnsiChar;      (* is this a block 0 or inline 1 element *)
+    desc        : PAnsiChar;   (* the description *)
 
 (* NRK Jan.2003
  * New fields encapsulating HTML structure
@@ -56,12 +56,12 @@
  *	are allowed.  Some element relationships are not fully represented:
  *	these are flagged with the word MODIFIER
  *)
-    subelts       : ppchar;		(* allowed sub-elements of this element *)
-    defaultsubelt : pchar;	(* subelement for suggested auto-repair
+    subelts       : PPAnsiChar;		(* allowed sub-elements of this element *)
+    defaultsubelt : PAnsiChar;	(* subelement for suggested auto-repair
 					   if necessary or NULL *)
-    attrs_opt     : ppchar;		(* Optional Attributes *)
-    attrs_depr    : ppchar;		(* Additional deprecated attributes *)
-    attrs_req     : ppchar;		(* Required attributes *)
+    attrs_opt     : PPAnsiChar;		(* Optional Attributes *)
+    attrs_depr    : PPAnsiChar;		(* Additional deprecated attributes *)
+    attrs_req     : PPAnsiChar;		(* Required attributes *)
   end;
 
 (*
@@ -69,8 +69,8 @@
  *)
   htmlEntityDesc = record
     value : cuint;	(* the UNICODE value for the character *)
-    name  : pchar;	(* The entity name *)
-    desc  : pchar;   (* the description *)
+    name  : PAnsiChar;	(* The entity name *)
+    desc  : PAnsiChar;   (* the description *)
   end;
 {$ENDIF}
 
@@ -89,13 +89,13 @@ function htmlParseEntityRef(ctxt: htmlParserCtxtPtr; str: xmlCharPtrPtr): htmlEn
 function htmlParseCharRef(ctxt: htmlParserCtxtPtr): cint; EXTDECL; external xml2lib;
 function htmlParseElement(ctxt: htmlParserCtxtPtr): cint; EXTDECL; external xml2lib;
 function htmlNewParserCtxt: htmlParserCtxtPtr; EXTDECL; external xml2lib;
-function htmlCreateMemoryParserCtxt(buffer: pchar; size: cint): htmlParserCtxtPtr; EXTDECL; external xml2lib;
+function htmlCreateMemoryParserCtxt(buffer: PAnsiChar; size: cint): htmlParserCtxtPtr; EXTDECL; external xml2lib;
 
 function htmlParseDocument(doc: htmlDocPtr; elem: htmlNodePtr): cint; EXTDECL; external xml2lib;
-function htmlSAXParseDoc(cur: xmlCharPtr; encoding: pchar; sax: htmlSAXHandlerPtr; userdata: pointer): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlParseDoc(cur: xmlCharPtr; encoding: pchar): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlSAXParseFile(filename, encoding: pchar; sax: htmlSAXHandlerPtr; userdata: pointer): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlParseFile(filename, encoding: pchar): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlSAXParseDoc(cur: xmlCharPtr; encoding: PAnsiChar; sax: htmlSAXHandlerPtr; userdata: pointer): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlParseDoc(cur: xmlCharPtr; encoding: PAnsiChar): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlSAXParseFile(filename, encoding: PAnsiChar; sax: htmlSAXHandlerPtr; userdata: pointer): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlParseFile(filename, encoding: PAnsiChar): htmlDocPtr; EXTDECL; external xml2lib;
 function UTF8ToHtml(_out: pointer; outlen: cint; _in: pointer; inlen: cint): cint; EXTDECL; external xml2lib;
 function htmlEncodeEntities(_out: pointer; outlen: cint; _in: pointer; inlen, quoteChar: cint): cint; EXTDECL; external xml2lib;
 function htmlIsScriptAttribute(name: xmlCharPtr): cint; EXTDECL; external xml2lib;
@@ -105,8 +105,8 @@ function htmlHandleOmittedElem(val: cint): cint; EXTDECL; external xml2lib;
 (**
  * Interfaces for the Push mode.
  *)
-function htmlCreatePushParserCtxt(sax: htmlSAXHandlerPtr; userdata: pointer; chunk: pchar; size: cint; filename: pchar; enc: xmlCharEncoding): htmlParserCtxtPtr; EXTDECL; external xml2lib;
-function htmlParseChunk(ctxt: htmlParserCtxtPtr; chunk: pchar; size, terminate: cint): htmlParserCtxtPtr; EXTDECL; external xml2lib;
+function htmlCreatePushParserCtxt(sax: htmlSAXHandlerPtr; userdata: pointer; chunk: PAnsiChar; size: cint; filename: PAnsiChar; enc: xmlCharEncoding): htmlParserCtxtPtr; EXTDECL; external xml2lib;
+function htmlParseChunk(ctxt: htmlParserCtxtPtr; chunk: PAnsiChar; size, terminate: cint): htmlParserCtxtPtr; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_PUSH_ENABLED *)
 procedure htmlFreeParserCtxt(ctxt: htmlParserCtxtPtr); EXTDECL; external xml2lib;
 {$ENDIF}
@@ -136,16 +136,16 @@ procedure htmlFreeParserCtxt(ctxt: htmlParserCtxtPtr); EXTDECL; external xml2lib
 {$IFDEF FUNCTION}
 procedure htmlCtxtReset(ctxt: htmlParserCtxtPtr); EXTDECL; external xml2lib;
 function htmlParseChunk(ctxt: htmlParserCtxtPtr; options: cint): cint; EXTDECL; external xml2lib;
-function htmlReadDoc(cur: xmlCharPtr; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlReadFile(URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlReadMemory(buffer: pchar; size: cint; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlReadFd(fd: cint; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlReadIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlCtxtReadDoc(ctxt: xmlParserCtxtPtr; cur: xmlCharPtr; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlCtxtReadFile(ctxt: xmlParserCtxtPtr; filename, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlCtxtReadMemory(ctxt: xmlParserCtxtPtr; buffer: pchar; size: cint; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlCtxtReadFd(ctxt: xmlParserCtxtPtr; fd: cint; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
-function htmlCtxtReadIO(ctxt: xmlParserCtxtPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: pchar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlReadDoc(cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlReadFile(URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlReadMemory(buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlReadFd(fd: cint; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlReadIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlCtxtReadDoc(ctxt: xmlParserCtxtPtr; cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlCtxtReadFile(ctxt: xmlParserCtxtPtr; filename, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlCtxtReadMemory(ctxt: xmlParserCtxtPtr; buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlCtxtReadFd(ctxt: xmlParserCtxtPtr; fd: cint; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
+function htmlCtxtReadIO(ctxt: xmlParserCtxtPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: PAnsiChar; options: cint): htmlDocPtr; EXTDECL; external xml2lib;
 {$ENDIF}
 
 {$IFDEF TYPE}
@@ -176,7 +176,7 @@ function htmlNodeStatus(node: htmlNodePtr; val: cint): htmlStatus; EXTDECL; exte
  *
  * Returns the default subelement for this element
  *)
-function htmlDefaultSubelement(elt: htmlElemDescPtr): pchar;
+function htmlDefaultSubelement(elt: htmlElemDescPtr): PAnsiChar;
 
 (**
  * htmlElementAllowedHereDesc:
@@ -196,7 +196,7 @@ function htmlElementAllowedHereDesc(parent: htmlElemDescPtr; elt: htmlElemDescPt
  *
  * Returns the attributes required for the specified element.
  *)
-function htmlRequiredAttrs(elt: htmlElemDescPtr): ppchar;
+function htmlRequiredAttrs(elt: htmlElemDescPtr): PPAnsiChar;
 {$ENDIF}
 
 {$ENDIF} (* LIBXML_HTML_ENABLED *)

packages/libxml/src/HTMLtree.inc

@@ -57,16 +57,16 @@ function htmlSetMetaEncoding(doc: htmlDocPtr; encoding: xmlCharPtr): cint; EXTDE
 procedure htmlDocDumpMemory(cur: xmlDocPtr; mem: xmlCharPtrPtr; size: pcint); EXTDECL; external xml2lib;
 procedure htmlDocDumpMemoryFormat(cur: xmlDocPtr; mem: xmlCharPtrPtr; size: pcint; format: cint); EXTDECL; external xml2lib;
 procedure htmlDocDump(f: PFILE; cur: xmlDocPtr); EXTDECL; external xml2lib;
-function htmlSaveFile(filename: pchar; doc: htmlDocPtr): cint; EXTDECL; external xml2lib;
+function htmlSaveFile(filename: PAnsiChar; doc: htmlDocPtr): cint; EXTDECL; external xml2lib;
 function htmlNodeDump(buf: xmlBufferPtr; doc: htmlDocPtr; cur: xmlNodePtr): cint; EXTDECL; external xml2lib;
 procedure htmlNodeDumpFile(_out: PFILE; doc: xmlDocPtr; cur: xmlNodePtr); EXTDECL; external xml2lib;
-function htmlNodeDumpFileFormat(_out: PFILE; doc: htmlDocPtr; cur: xmlNodePtr; encoding: pchar; format: cint): cint; EXTDECL; external xml2lib;
-function htmlSaveFileEnc(filename: pchar; cur: htmlDocPtr; encoding: pchar): cint; EXTDECL; external xml2lib;
-function htmlSaveFileFormat(filename: pchar; cur: htmlDocPtr; encoding: pchar; format: cint): cint; EXTDECL; external xml2lib;
-procedure htmlNodeDumpFormatOutput(buf: xmlOutputBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; encoding: pchar; format: cint); EXTDECL; external xml2lib;
-procedure htmlDocContentDumpOutput(buf: xmlOutputBufferPtr; cur: xmlNodePtr; encoding: pchar); EXTDECL; external xml2lib;
-procedure htmlDocContentDumpFormatOutput(buf: xmlOutputBufferPtr; cur: xmlNodePtr; encoding: pchar; format: cint); EXTDECL; external xml2lib;
-procedure htmlNodeDumpOutput(buf: xmlOutputBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; encoding: pchar); EXTDECL; external xml2lib;
+function htmlNodeDumpFileFormat(_out: PFILE; doc: htmlDocPtr; cur: xmlNodePtr; encoding: PAnsiChar; format: cint): cint; EXTDECL; external xml2lib;
+function htmlSaveFileEnc(filename: PAnsiChar; cur: htmlDocPtr; encoding: PAnsiChar): cint; EXTDECL; external xml2lib;
+function htmlSaveFileFormat(filename: PAnsiChar; cur: htmlDocPtr; encoding: PAnsiChar; format: cint): cint; EXTDECL; external xml2lib;
+procedure htmlNodeDumpFormatOutput(buf: xmlOutputBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; encoding: PAnsiChar; format: cint); EXTDECL; external xml2lib;
+procedure htmlDocContentDumpOutput(buf: xmlOutputBufferPtr; cur: xmlNodePtr; encoding: PAnsiChar); EXTDECL; external xml2lib;
+procedure htmlDocContentDumpFormatOutput(buf: xmlOutputBufferPtr; cur: xmlNodePtr; encoding: PAnsiChar; format: cint); EXTDECL; external xml2lib;
+procedure htmlNodeDumpOutput(buf: xmlOutputBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; encoding: PAnsiChar); EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_OUTPUT_ENABLED *)
 function htmlIsBooleanAttr(name: xmlCharPtr): cint; EXTDECL; external xml2lib;
 {$ENDIF}

packages/libxml/src/c14n.inc

@@ -59,7 +59,7 @@ function xmlC14NDocDumpMemory(doc: xmlDocPtr; nodes: xmlNodeSetPtr; exclusive: c
   with_comments: cint; doc_txt_ptr: xmlCharPtrPtr): cint; EXTDECL; external xml2lib;
 
 function xmlC14NDocSave(doc: xmlDocPtr; nodes: xmlNodeSetPtr; exclusive: cint; inclusive_ns_prefixes: xmlCharPtrPtr;
-  with_comments: cint; filename: pchar; compression: cint): cint; EXTDECL; external xml2lib;
+  with_comments: cint; filename: PAnsiChar; compression: cint): cint; EXTDECL; external xml2lib;
 
 function xmlC14NExecute(doc: xmlDocPtr; is_visible_callback: xmlC14NIsVisibleCallback; user_data: pointer;
   exclusive: cint; inclusive_ns_prefixes: xmlCharPtrPtr; with_comments: cint; buf: xmlOutputBufferPtr): cint; EXTDECL; external xml2lib;

packages/libxml/src/catalog.inc

@@ -61,8 +61,8 @@
  * Operations on a given catalog.
  *)
 function xmlNewCatalog(sgml: cint): xmlCatalogPtr; EXTDECL; external xml2lib;
-function xmlLoadACatalog(filename: pchar): xmlCatalogPtr; EXTDECL; external xml2lib;
-function xmlLoadSGMLSuperCatalog(filename: pchar): xmlCatalogPtr; EXTDECL; external xml2lib;
+function xmlLoadACatalog(filename: PAnsiChar): xmlCatalogPtr; EXTDECL; external xml2lib;
+function xmlLoadSGMLSuperCatalog(filename: PAnsiChar): xmlCatalogPtr; EXTDECL; external xml2lib;
 function xmlLoadACatalog(catal: xmlCatalogPtr): cint; EXTDECL; external xml2lib;
 function xmlACatalogAdd(catal: xmlCatalogPtr; _type, orig, replace: xmlCharPtr): cint; EXTDECL; external xml2lib;
 function xmlACatalogRemove(catal: xmlCatalogPtr; value: xmlCharPtr): cint; EXTDECL; external xml2lib;
@@ -80,8 +80,8 @@ function xmlCatalogIsEmpty(catal: xmlCatalogPtr): cint; EXTDECL; external xml2li
  * Global operations.
  *)
 procedure xmlInitializeCatalog; EXTDECL; external xml2lib;
-function xmlLoadCatalog(filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlLoadCatalogs(paths: pchar): cint; EXTDECL; external xml2lib;
+function xmlLoadCatalog(filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlLoadCatalogs(paths: PAnsiChar): cint; EXTDECL; external xml2lib;
 procedure xmlCatalogCleanup; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_OUTPUT_ENABLED}
 procedure xmlCatalogDump(_out: PFILE); EXTDECL; external xml2lib;
@@ -92,7 +92,7 @@ function xmlCatalogResolvePublic(pubID: xmlCharPtr): xmlCharPtr; EXTDECL; extern
 function xmlCatalogResolveURI(URI: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlCatalogAdd(_type, orig, replace: xmlCharPtr): cint; EXTDECL; external xml2lib;
 function xmlCatalogRemove(value: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlParseCatalogFile(filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlParseCatalogFile(filename: PAnsiChar): xmlDocPtr; EXTDECL; external xml2lib;
 function xmlCatalogConvert: cint; EXTDECL; external xml2lib;
 
 (*

packages/libxml/src/chvalid.inc

@@ -48,7 +48,7 @@ function xmlCharInRange(val: cint; group: xmlChRangeGroupPtr): cbool; EXTDECL; e
 
 (**
  * xmlIsBaseChar_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -56,7 +56,7 @@ function xmlIsBaseChar_ch(c: cint): cbool;
 
 (**
  * xmlIsBaseCharQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -73,7 +73,7 @@ var
 
 (**
  * xmlIsBlank_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -81,7 +81,7 @@ function xmlIsBlank_ch(c: cint): cbool;
 
 (**
  * xmlIsBlankQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -89,7 +89,7 @@ function xmlIsBlankQ(c: cint): cbool;
 
 (**
  * xmlIsChar_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -97,7 +97,7 @@ function xmlIsChar_ch(c: cint): cbool;
 
 (**
  * xmlIsCharQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -114,7 +114,7 @@ var
 
 (**
  * xmlIsCombiningQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -131,7 +131,7 @@ var
 
 (**
  * xmlIsDigit_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -139,7 +139,7 @@ function xmlIsDigit_ch(c: cint): cbool;
 
 (**
  * xmlIsDigitQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -156,7 +156,7 @@ var
 
 (**
  * xmlIsExtender_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -164,7 +164,7 @@ function xmlIsExtender_ch(c: cint): cbool;
 
 (**
  * xmlIsExtenderQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -181,7 +181,7 @@ var
 
 (**
  * xmlIsIdeographicQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -206,7 +206,7 @@ var
 
 (**
  * xmlIsPubidChar_ch:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)
@@ -214,7 +214,7 @@ function xmlIsPubidChar_ch(c: cint): cbool;
 
 (**
  * xmlIsPubidCharQ:
- * @c: char to validate
+ * @c: AnsiChar to validate
  *
  * Automatically generated by genChRanges.py
  *)

packages/libxml/src/debugXML.inc

@@ -82,7 +82,7 @@ external xml2lib void EXTDECL
 external xml2lib int EXTDECL	
 	xmlLsCountNode		(xmlNodePtr node);
 
-external xml2lib char * EXTDECL 
+external xml2lib AnsiChar * EXTDECL 
 	xmlBoolToText		(int boolval);
 
 (****************************************************************
@@ -100,7 +100,7 @@ external xml2lib char * EXTDECL
  *
  * Returns a string which will be freed by the Shell.
  *)
-typedef char * (* xmlShellReadlineFunc)(char *prompt);
+typedef AnsiChar * (* xmlShellReadlineFunc)(AnsiChar *prompt);
 
 (**
  * xmlShellCtxt:
@@ -111,7 +111,7 @@ typedef char * (* xmlShellReadlineFunc)(char *prompt);
 typedef struct _xmlShellCtxt xmlShellCtxt;
 typedef xmlShellCtxt *xmlShellCtxtPtr;
 struct _xmlShellCtxt {
-    char *filename;
+    AnsiChar *filename;
     xmlDocPtr doc;
     xmlNodePtr node;
     xmlXPathContextPtr pctxt;
@@ -132,33 +132,33 @@ struct _xmlShellCtxt {
  * Returns an int, negative returns indicating errors.
  *)
 typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
-                             char *arg,
+                             AnsiChar *arg,
 			     xmlNodePtr node,
 			     xmlNodePtr node2);
 
 external xml2lib void EXTDECL	
 	xmlShellPrintXPathError	(int errorType,
-				 char *arg);
+				 AnsiChar *arg);
 external xml2lib void EXTDECL	
 	xmlShellPrintXPathResult(xmlXPathObjectPtr list);
 external xml2lib int EXTDECL	
 	xmlShellList		(xmlShellCtxtPtr ctxt,
-				 char *arg,
+				 AnsiChar *arg,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellBase		(xmlShellCtxtPtr ctxt,
-				 char *arg,
+				 AnsiChar *arg,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellDir		(xmlShellCtxtPtr ctxt,
-				 char *arg,
+				 AnsiChar *arg,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellLoad		(xmlShellCtxtPtr ctxt,
-				 char *filename,
+				 AnsiChar *filename,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 { LIBXML_OUTPUT_ENABLED
@@ -166,35 +166,35 @@ external xml2lib void EXTDECL
 	xmlShellPrintNode	(xmlNodePtr node);
 external xml2lib int EXTDECL	
 	xmlShellCat		(xmlShellCtxtPtr ctxt,
-				 char *arg,
+				 AnsiChar *arg,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellWrite		(xmlShellCtxtPtr ctxt,
-				 char *filename,
+				 AnsiChar *filename,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellSave		(xmlShellCtxtPtr ctxt,
-				 char *filename,
+				 AnsiChar *filename,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 #endif (* LIBXML_OUTPUT_ENABLED *)
 { LIBXML_VALID_ENABLED
 external xml2lib int EXTDECL	
 	xmlShellValidate	(xmlShellCtxtPtr ctxt,
-				 char *dtd,
+				 AnsiChar *dtd,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 #endif (* LIBXML_VALID_ENABLED *)
 external xml2lib int EXTDECL	
 	xmlShellDu		(xmlShellCtxtPtr ctxt,
-				 char *arg,
+				 AnsiChar *arg,
 				 xmlNodePtr tree,
 				 xmlNodePtr node2);
 external xml2lib int EXTDECL	
 	xmlShellPwd		(xmlShellCtxtPtr ctxt,
-				 char *buffer,
+				 AnsiChar *buffer,
 				 xmlNodePtr node,
 				 xmlNodePtr node2);
 
@@ -203,7 +203,7 @@ external xml2lib int EXTDECL
  *)
 external xml2lib void EXTDECL	
 	xmlShell		(xmlDocPtr doc,
-				 char *filename,
+				 AnsiChar *filename,
 				 xmlShellReadlineFunc input,
 				 FILE *output);
 			 

packages/libxml/src/encoding.inc

@@ -46,8 +46,8 @@
  *)
 {$IFDEF TYPE}
   xmlCharEncoding = (
-    XML_CHAR_ENCODING_ERROR=   -1, (* No char encoding detected *)
-    XML_CHAR_ENCODING_NONE=	0, (* No char encoding detected *)
+    XML_CHAR_ENCODING_ERROR=   -1, (* No AnsiChar encoding detected *)
+    XML_CHAR_ENCODING_NONE=	0, (* No AnsiChar encoding detected *)
     XML_CHAR_ENCODING_UTF8=	1, (* UTF-8 *)
     XML_CHAR_ENCODING_UTF16LE=	2, (* UTF-16 little endian *)
     XML_CHAR_ENCODING_UTF16BE=	3, (* UTF-16 big endian *)
@@ -88,7 +88,7 @@
  *     if the return value is positive, else unpredictiable.
  * The value of @outlen after return is the number of octets consumed.
  *)
-  xmlCharEncodingInputFunc = function(_out: pchar; outlen: pcint; _in: pchar; inlen: pcint): cint; cdecl;
+  xmlCharEncodingInputFunc = function(_out: PAnsiChar; outlen: pcint; _in: PAnsiChar; inlen: pcint): cint; cdecl;
 
 (**
  * xmlCharEncodingOutputFunc:
@@ -108,14 +108,14 @@
  *     if the return value is positive, else unpredictiable.
  * The value of @outlen after return is the number of octets produced.
  *)
-  xmlCharEncodingOutputFunc = function(_out: pchar; outlen: pcint; _in: pchar; inlen: pcint): cint; cdecl;
+  xmlCharEncodingOutputFunc = function(_out: PAnsiChar; outlen: pcint; _in: PAnsiChar; inlen: pcint): cint; cdecl;
 
 (*
  * Block defining the handlers for non UTF-8 encodings.
  * If iconv is supported, there are two extra fields.
  *)
   xmlCharEncodingHandler = record
-    name      : pchar;
+    name      : PAnsiChar;
     input     : xmlCharEncodingInputFunc;
     output    : xmlCharEncodingOutputFunc;
 {$IFDEF LIBXML_ICONV_ENABLED}
@@ -133,23 +133,23 @@ procedure xmlInitCharEncodingHandlers; EXTDECL; external xml2lib;
 procedure xmlCleanupCharEncodingHandlers; EXTDECL; external xml2lib;
 procedure xmlRegisterCharEncodingHandler(handler: xmlCharEncodingHandlerPtr); EXTDECL; external xml2lib;
 function xmlGetCharEncodingHandler(enc: xmlCharEncoding): xmlCharEncodingHandlerPtr; EXTDECL; external xml2lib;
-function xmlFindCharEncodingHandler(name: pchar): xmlCharEncodingHandlerPtr; EXTDECL; external xml2lib;
-function xmlNewCharEncodingHandler(name: pchar; input: xmlCharEncodingInputFunc; output: xmlCharEncodingOutputFunc): xmlCharEncodingHandlerPtr; EXTDECL; external xml2lib;
+function xmlFindCharEncodingHandler(name: PAnsiChar): xmlCharEncodingHandlerPtr; EXTDECL; external xml2lib;
+function xmlNewCharEncodingHandler(name: PAnsiChar; input: xmlCharEncodingInputFunc; output: xmlCharEncodingOutputFunc): xmlCharEncodingHandlerPtr; EXTDECL; external xml2lib;
 
 (*
  * Interfaces for encoding names and aliases.
  *)
-function xmlAddEncodingAlias(name: pchar; alias: pchar): cint; EXTDECL; external xml2lib;
-function xmlDelEncodingAlias(alias: pchar): cint; EXTDECL; external xml2lib;
-function xmlGetEncodingAlias(alias: pchar): pchar; EXTDECL; external xml2lib;
+function xmlAddEncodingAlias(name: PAnsiChar; alias: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlDelEncodingAlias(alias: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlGetEncodingAlias(alias: PAnsiChar): PAnsiChar; EXTDECL; external xml2lib;
 procedure xmlCleanupEncodingAliases; EXTDECL; external xml2lib;
-function xmlParseCharEncoding(name: pchar): xmlCharEncoding; EXTDECL; external xml2lib;
-function xmlGetCharEncodingName(enc: xmlCharEncoding): pchar; EXTDECL; external xml2lib;
+function xmlParseCharEncoding(name: PAnsiChar): xmlCharEncoding; EXTDECL; external xml2lib;
+function xmlGetCharEncodingName(enc: xmlCharEncoding): PAnsiChar; EXTDECL; external xml2lib;
 
 (*
  * Interfaces directly used by the parsers.
  *)
-function xmlDetectCharEncoding(_in: pchar; len: cint): xmlCharEncoding; EXTDECL; external xml2lib;
+function xmlDetectCharEncoding(_in: PAnsiChar; len: cint): xmlCharEncoding; EXTDECL; external xml2lib;
 function xmlCharEncOutFunc(handler: xmlCharEncodingHandlerPtr; _out, _in: xmlBufferPtr): cint; EXTDECL; external xml2lib;
 function xmlCharEncInFunc(handler: xmlCharEncodingHandlerPtr; _out, _in: xmlBufferPtr): cint; EXTDECL; external xml2lib;
 function xmlCharEncFirstLine(handler: xmlCharEncodingHandlerPtr; _out, _in: xmlBufferPtr): cint; EXTDECL; external xml2lib;
@@ -159,7 +159,7 @@ function xmlCharEncCloseFunc(handler: xmlCharEncodingHandlerPtr): cint; EXTDECL;
  * Export a few useful functions
  *)
 {$IFDEF LIBXML_OUTPUT_ENABLED}
-function UTF8Toisolat1(_out: pchar; outlen: pcint; _in: pchar; inlen: pcint): cint; EXTDECL; external xml2lib;
+function UTF8Toisolat1(_out: PAnsiChar; outlen: pcint; _in: PAnsiChar; inlen: pcint): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_OUTPUT_ENABLED *)
-function isolat1ToUTF8(_out: pchar; outlen: pcint; _in: pchar; inlen: pcint): cint; EXTDECL; external xml2lib;
+function isolat1ToUTF8(_out: PAnsiChar; outlen: pcint; _in: PAnsiChar; inlen: pcint): cint; EXTDECL; external xml2lib;
 {$ENDIF}

packages/libxml/src/globals.inc

@@ -25,8 +25,8 @@ procedure xmlCleanupGlobals; EXTDECL; external xml2lib;
 {$ENDIF}
 
 {$IFDEF TYPE}
-  xmlParserInputBufferCreateFilenameFunc = function(URI: pchar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL;
-  xmlOutputBufferCreateFilenameFunc = function(URI: pchar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL;
+  xmlParserInputBufferCreateFilenameFunc = function(URI: PAnsiChar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL;
+  xmlOutputBufferCreateFilenameFunc = function(URI: PAnsiChar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL;
 {$ENDIF}
 
 {$IFDEF FUNCTION}
@@ -44,7 +44,7 @@ function xmlOutputBufferCreateFilenameDefault(func: xmlOutputBufferCreateFilenam
   xmlDeregisterNodeFunc = procedure(node: xmlNodePtr); EXTDECL;
 
   xmlGlobalState = record
-    xmlParserVersion                        : pchar;
+    xmlParserVersion                        : PAnsiChar;
 
     xmlDefaultSAXLocator                    : xmlSAXLocator;
     xmlDefaultSAXHandler                    : xmlSAXHandlerV1;
@@ -76,7 +76,7 @@ function xmlOutputBufferCreateFilenameDefault(func: xmlOutputBufferCreateFilenam
 
     xmlSaveNoEmptyTags                      : cint;
     xmlIndentTreeOutput                     : cint;
-    xmlTreeIndentString                     : pchar;
+    xmlTreeIndentString                     : PAnsiChar;
 
     xmlRegisterNodeDefaultValue             : xmlRegisterNodeFunc;
     xmlDeregisterNodeDefaultValue           : xmlDeregisterNodeFunc;
@@ -345,16 +345,16 @@ var
 {$ENDIF}
 function xmlThrDefIndentTreeOutput(v: cint): cint; EXTDECL; external xml2lib;
 
-function __xmlTreeIndentString: ppchar; EXTDECL; external xml2lib;
+function __xmlTreeIndentString: PPAnsiChar; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_THREAD_ENABLED}
 {$DEFINE xmlTreeIndentString := __xmlTreeIndentString()^ }
 {$ELSE}
 {$IFNDEF NO_EXTERNAL_VARS}
 var
-  xmlTreeIndentString: pchar; cvar; external;
+  xmlTreeIndentString: PAnsiChar; cvar; external;
 {$ENDIF}
 {$ENDIF}
-function xmlThrDefTreeIndentString(v: pchar): pchar; EXTDECL; external xml2lib;
+function xmlThrDefTreeIndentString(v: PAnsiChar): PAnsiChar; EXTDECL; external xml2lib;
 
 function __xmlKeepBlanksDefaultValue: pcint; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_THREAD_ENABLED}
@@ -400,13 +400,13 @@ var
 {$ENDIF}
 function xmlThrDefParserDebugEntities(v: cint): cint; EXTDECL; external xml2lib;
 
-function __xmlParserVersion: ppchar; EXTDECL; external xml2lib;
+function __xmlParserVersion: PPAnsiChar; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_THREAD_ENABLED}
 {$DEFINE xmlParserVersion := __xmlParserVersion()^ }
 {$ELSE}
 {$IFNDEF NO_EXTERNAL_VARS}
 var
-  xmlParserVersion: pchar; cvar; external;
+  xmlParserVersion: PAnsiChar; cvar; external;
 {$ENDIF}
 {$ENDIF}
 

packages/libxml/src/libxmlparser.inc

@@ -51,10 +51,10 @@
     (* Input buffer *)
     buf         : xmlParserInputBufferPtr;      (* UTF-8 encoded buffer *)
 
-    filename    : pchar;             (* The file analyzed, if any *)
-    directory   : pchar;            (* the directory/base of the file *)
+    filename    : PAnsiChar;             (* The file analyzed, if any *)
+    directory   : PAnsiChar;            (* the directory/base of the file *)
     base        : xmlCharPtr;              (* Base of the array to parse *)
-    cur         : xmlCharPtr;               (* Current char being parsed *)
+    cur         : xmlCharPtr;               (* Current AnsiChar being parsed *)
     _end        : xmlCharPtr;               (* end of the array to parse *)
     length      : cint;                       (* length if known *)
     line        : cint;                         (* Current line *)
@@ -213,9 +213,9 @@
     vctxt             : xmlValidCtxt;        (* The validity context *)
 
     instate           : xmlParserInputState;      (* current type of input *)
-    token             : cint;        (* next char look-ahead *)
+    token             : cint;        (* next AnsiChar look-ahead *)
 
-    directory         : pchar;        (* the data directory *)
+    directory         : PAnsiChar;        (* the data directory *)
 
     (* Node name stack *)
     name              : xmlCharPtr;          (* Current parsed Node *)
@@ -565,7 +565,7 @@
  *
  * Display and format a warning messages, callback.
  *)
-  warningSAXFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  warningSAXFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (**
  * errorSAXFunc:
@@ -575,7 +575,7 @@
  *
  * Display and format an error messages, callback.
  *)
-  errorSAXFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  errorSAXFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (**
  * fatalErrorSAXFunc:
@@ -587,7 +587,7 @@
  * Note: so far fatalError() SAX callbacks are not used, error()
  *       get all the callbacks for errors.
  *)
-  fatalErrorSAXFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  fatalErrorSAXFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (**
  * isStandaloneSAXFunc:
@@ -749,7 +749,7 @@
  *
  * Returns the entity input parser.
  *)
-  xmlExternalEntityLoader = function(URL, ID: pchar; context: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL;
+  xmlExternalEntityLoader = function(URL, ID: PAnsiChar; context: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL;
 
 (**
  * xmlParserOption:
@@ -837,8 +837,8 @@ function xmlParserInputGrow(_in: xmlParserInputPtr; len: cint): cint; EXTDECL; e
  *)
 {$IFDEF LIBXML_SAX1_ENABLED}
 function xmlParseDoc(cur: xmlCharPtr): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlParseFile(filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlParseMemory(buffer: pchar; size: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlParseFile(filename: PAnsiChar): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlParseMemory(buffer: PAnsiChar; size: cint): xmlDocPtr; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_SAX1_ENABLED *)
 function xmlSubstituteEntitiesDefault(val: cint): cint; EXTDECL; external xml2lib;
 function xmlKeepBlanksDefault(val: cint): cint; EXTDECL; external xml2lib;
@@ -851,8 +851,8 @@ function xmlLineNumbersDefault(val: cint): cint; EXTDECL; external xml2lib;
  * Recovery mode
  *)
 function xmlRecoverDoc(cur: xmlCharPtr): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlRecoverMemory(buffer: pchar; size: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlRecoverFile(filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlRecoverMemory(buffer: PAnsiChar; size: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlRecoverFile(filename: PAnsiChar): xmlDocPtr; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_SAX1_ENABLED *)
 
 (*
@@ -861,15 +861,15 @@ function xmlRecoverFile(filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
 function xmlParseDocument(ctxt: xmlParserCtxtPtr): cint; EXTDECL; external xml2lib;
 function xmlParseExtParsedEnt(ctxt: xmlParserCtxtPtr): cint; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_SAX1_ENABLED}
-function xmlSAXUserParseFile(sax: xmlSAXHandlerPtr; user_data: pointer; filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlSAXUserParseMemory(sax: xmlSAXHandlerPtr; user_data: pointer; buffer: pchar; size: cint): cint; EXTDECL; external xml2lib;
+function xmlSAXUserParseFile(sax: xmlSAXHandlerPtr; user_data: pointer; filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlSAXUserParseMemory(sax: xmlSAXHandlerPtr; user_data: pointer; buffer: PAnsiChar; size: cint): cint; EXTDECL; external xml2lib;
 function xmlSAXParseDoc(sax: xmlSAXHandlerPtr; cur: xmlCharPtr; recovery: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlSAXParseMemory(sax: xmlSAXHandlerPtr; buffer: pchar; size: cint; recovery: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlSAXParseMemoryWithData(sax: xmlSAXHandlerPtr; buffer: pchar; size: cint; recovery: cint; data: pointer): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlSAXParseFile(sax: xmlSAXHandlerPtr; filename: pchar; recovery: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlSAXParseFileWithData(sax: xmlSAXHandlerPtr; filename: pchar; recovery: cint; data: pointer): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlSAXParseEntity(sax: xmlSAXHandlerPtr; filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlParseEntity(filename: pchar): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlSAXParseMemory(sax: xmlSAXHandlerPtr; buffer: PAnsiChar; size: cint; recovery: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlSAXParseMemoryWithData(sax: xmlSAXHandlerPtr; buffer: PAnsiChar; size: cint; recovery: cint; data: pointer): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlSAXParseFile(sax: xmlSAXHandlerPtr; filename: PAnsiChar; recovery: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlSAXParseFileWithData(sax: xmlSAXHandlerPtr; filename: PAnsiChar; recovery: cint; data: pointer): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlSAXParseEntity(sax: xmlSAXHandlerPtr; filename: PAnsiChar): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlParseEntity(filename: PAnsiChar): xmlDocPtr; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_SAX1_ENABLED *)
 
 {$IFDEF LIBXML_VALID_ENABLED}
@@ -880,7 +880,7 @@ function xmlIOParseDTD(sax: xmlSAXHandlerPtr; input: xmlParserInputBufferPtr; en
 {$IFDEF LIBXML_SAX1_ENABLED}
 function xmlParseBalancedChunkMemory(doc: xmlDocPtr; sax: xmlSAXHandlerPtr; user_data: pointer; depth: cint; _string: xmlCharPtr; lst: xmlNodePtrPtr): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_SAX1_ENABLED *)
-function xmlParseInNodeContext(node: xmlNodePtr; data: pchar; datalen, options: cint; lst: xmlNodePtrPtr): xmlParserErrors; EXTDECL; external xml2lib;
+function xmlParseInNodeContext(node: xmlNodePtr; data: PAnsiChar; datalen, options: cint; lst: xmlNodePtrPtr): xmlParserErrors; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_SAX1_ENABLED}
 function xmlParseBalancedChunkMemoryRecover(doc: xmlDocPtr; sax: xmlSAXHandlerPtr; user_data: pointer;
   depth: cint; _string: xmlCharPtr; lst: xmlNodePtrPtr; recover: cint): cint; EXTDECL; external xml2lib;
@@ -898,7 +898,7 @@ function xmlInitParserCtxt(ctxt: xmlParserCtxtPtr): cint; EXTDECL; external xml2
 procedure xmlClearParserCtxt(ctxt: xmlParserCtxtPtr); EXTDECL; external xml2lib;
 procedure xmlFreeParserCtxt(ctxt: xmlParserCtxtPtr); EXTDECL; external xml2lib;
 {$IFDEF LIBXML_SAX1_ENABLED}
-procedure xmlSetupParserForBuffer(ctxt: xmlParserCtxtPtr; buffer: xmlCharPtr; filename: pchar); EXTDECL; external xml2lib;
+procedure xmlSetupParserForBuffer(ctxt: xmlParserCtxtPtr; buffer: xmlCharPtr; filename: PAnsiChar); EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_SAX1_ENABLED *)
 function xmlCreateDocParserCtxt(cur: xmlCharPtr): xmlParserCtxtPtr; EXTDECL; external xml2lib;
 
@@ -906,17 +906,17 @@ function xmlCreateDocParserCtxt(cur: xmlCharPtr): xmlParserCtxtPtr; EXTDECL; ext
 (*
  * Reading/setting optional parsing features.
  *)
-function xmlGetFeaturesList(var len: cint; var result: pchar): cint; EXTDECL; external xml2lib;
-function xmlGetFeature(ctxt: xmlParserCtxtPtr; name: pchar; result: pointer): cint; EXTDECL; external xml2lib;
-function xmlSetFeature(ctxt: xmlParserCtxtPtr; name: pchar; value: pointer): cint; EXTDECL; external xml2lib;
+function xmlGetFeaturesList(var len: cint; var result: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlGetFeature(ctxt: xmlParserCtxtPtr; name: PAnsiChar; result: pointer): cint; EXTDECL; external xml2lib;
+function xmlSetFeature(ctxt: xmlParserCtxtPtr; name: PAnsiChar; value: pointer): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_LEGACY_ENABLED *)
 
 {$IFDEF LIBXML_PUSH_ENABLED}
 (*
  * Interfaces for the Push mode.
  *)
-function xmlCreatePushParserCtxt(sax: xmlSAXHandlerPtr; user_data: pointer; chunk: pchar; size: cint; filename: pchar): xmlParserCtxtPtr; EXTDECL; external xml2lib;
-function xmlParseChunk(ctxt: xmlParserCtxtPtr; chunk: pchar; size, terminate: cint): cint; EXTDECL; external xml2lib;
+function xmlCreatePushParserCtxt(sax: xmlSAXHandlerPtr; user_data: pointer; chunk: PAnsiChar; size: cint; filename: PAnsiChar): xmlParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlParseChunk(ctxt: xmlParserCtxtPtr; chunk: PAnsiChar; size, terminate: cint): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_PUSH_ENABLED *)
 
 (*
@@ -940,7 +940,7 @@ procedure xmlParserAddNodeInfo(ctxt: xmlParserCtxtPtr; info: xmlParserNodeInfoPt
  *)
 procedure xmlSetExternalEntityLoader(f: xmlExternalEntityLoader); EXTDECL; external xml2lib;
 function xmlGetExternalEntityLoader(): xmlExternalEntityLoader; EXTDECL; external xml2lib;
-function xmlLoadExternalEntity(URL, ID: pchar; ctxt: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL; external xml2lib;
+function xmlLoadExternalEntity(URL, ID: PAnsiChar; ctxt: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL; external xml2lib;
 
 (*
  * Index lookup, actually implemented in the encoding module
@@ -951,18 +951,18 @@ function xmlByteConsumed(ctxt: xmlParserCtxtPtr): culong; EXTDECL; external xml2
  * New set of simpler/more flexible APIs
  *)
 procedure xmlCtxtReset(ctxt: xmlParserCtxtPtr); EXTDECL; external xml2lib;
-function xmlCtxtResetPush(ctxt: xmlParserCtxtPtr; chunk: pchar; size: cint; filename, encoding: pchar): cint; EXTDECL; external xml2lib;
+function xmlCtxtResetPush(ctxt: xmlParserCtxtPtr; chunk: PAnsiChar; size: cint; filename, encoding: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlCtxtUseOptions(ctxt: xmlParserCtxtPtr; options: cint): cint; EXTDECL; external xml2lib;
-function xmlReadDoc(cur: xmlCharPtr; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlReadFile(filename, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlReadMemory(buffer: pchar; size: cint; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlReadFd(fd: cint; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlReadIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlCtxtReadDoc(ctxt: xmlParserCtxtPtr; cur: xmlCharPtr; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlCtxtReadFile(ctxt: xmlParserCtxtPtr; filename, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlCtxtReadMemory(ctxt: xmlParserCtxtPtr; buffer: pchar; size: cint; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlCtxtReadFd(ctxt: xmlParserCtxtPtr; fd: cint; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
-function xmlCtxtReadIO(ctxt: xmlParserCtxtPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pchar; URL, encoding: pchar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlReadDoc(cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlReadFile(filename, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlReadMemory(buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlReadFd(fd: cint; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlReadIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlCtxtReadDoc(ctxt: xmlParserCtxtPtr; cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlCtxtReadFile(ctxt: xmlParserCtxtPtr; filename, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlCtxtReadMemory(ctxt: xmlParserCtxtPtr; buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlCtxtReadFd(ctxt: xmlParserCtxtPtr; fd: cint; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
+function xmlCtxtReadIO(ctxt: xmlParserCtxtPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: PAnsiChar; URL, encoding: PAnsiChar; options: cint): xmlDocPtr; EXTDECL; external xml2lib;
 
 (*
  * Library wide options

packages/libxml/src/nanoftp.inc

@@ -29,7 +29,7 @@
  * A callback for the xmlNanoFTPList command.
  * Note that only one of year and day:minute are specified.
  *)
-  ftpListCallback = procedure(userData: pointer; filename, attrib, owner, group: pchar; size: culong; links, year: cint; month: pchar; day, hour, minute: cint); EXTDECL;
+  ftpListCallback = procedure(userData: pointer; filename, attrib, owner, group: PAnsiChar; size: culong; links, year: cint; month: PAnsiChar; day, hour, minute: cint); EXTDECL;
 
 (**
  * ftpDataCallback: 
@@ -39,7 +39,7 @@
  *
  * A callback for the xmlNanoFTPGet command.
  *)
-  ftpDataCallback = procedure(userData: pointer; data: pchar; len: cint); EXTDECL;
+  ftpDataCallback = procedure(userData: pointer; data: PAnsiChar; len: cint); EXTDECL;
 {$ENDIF}
 
 {$IFDEF FUNCTION}
@@ -52,20 +52,20 @@ procedure xmlNanoFTPCleanup; EXTDECL; external xml2lib;
 (*
  * Creating/freeing contexts.
  *)
-function xmlNanoFTPNewCtxt(URL: pchar): pointer; EXTDECL; external xml2lib;
+function xmlNanoFTPNewCtxt(URL: PAnsiChar): pointer; EXTDECL; external xml2lib;
 procedure xmlNanoFTPFreeCtxt(ctx: pointer); EXTDECL; external xml2lib;
-function xmlNanoFTPConnectTo(server: pchar; port: cint): pointer; EXTDECL; external xml2lib;
+function xmlNanoFTPConnectTo(server: PAnsiChar; port: cint): pointer; EXTDECL; external xml2lib;
 
 (*
  * Opening/closing session connections.
  *)
-function xmlNanoFTPOpen(URL: pchar): pointer; EXTDECL; external xml2lib;
+function xmlNanoFTPOpen(URL: PAnsiChar): pointer; EXTDECL; external xml2lib;
 function xmlNanoFTPConnect(ctx: pointer): cint; EXTDECL; external xml2lib;
 function xmlNanoFTPClose(ctx: pointer): cint; EXTDECL; external xml2lib;
 function xmlNanoFTPQuit(ctx: pointer): cint; EXTDECL; external xml2lib;
-procedure xmlNanoFTPScanProxy(URL: pchar); EXTDECL; external xml2lib;
-procedure xmlNanoFTPProxy(host: pchar; port: cint; user, passwd: pchar; _type: cint); EXTDECL; external xml2lib;
-function xmlNanoFTPUpdateURL(ctx: pointer; URL: pchar): cint; EXTDECL; external xml2lib;
+procedure xmlNanoFTPScanProxy(URL: PAnsiChar); EXTDECL; external xml2lib;
+procedure xmlNanoFTPProxy(host: PAnsiChar; port: cint; user, passwd: PAnsiChar; _type: cint); EXTDECL; external xml2lib;
+function xmlNanoFTPUpdateURL(ctx: pointer; URL: PAnsiChar): cint; EXTDECL; external xml2lib;
 
 (*
  * Rather internal commands.
@@ -76,13 +76,13 @@ function xmlNanoFTPCheckResponse(ctx: pointer): cint; EXTDECL; external xml2lib;
 (*
  * CD/DIR/GET handlers.
  *)
-function xmlNanoFTPCwd(ctx: pointer; directory: pchar): cint; EXTDECL; external xml2lib;
-function xmlNanoFTPGetResponse(ctx: pointer; _file: pchar): cint; EXTDECL; external xml2lib;
+function xmlNanoFTPCwd(ctx: pointer; directory: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlNanoFTPGetResponse(ctx: pointer; _file: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlNanoFTPGetConnection(ctx: pointer): cint; EXTDECL; external xml2lib;
 function xmlNanoFTPCloseConnection(ctx: pointer): cint; EXTDECL; external xml2lib;
-function xmlNanoFTPList(ctx: pointer; callback: ftpListCallback; userData: pointer; filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlNanoFTPGetSocket(ctx: pointer; filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlNanoFTPGet(ctx: pointer; callback: ftpDataCallback; userData: pointer; filename: pchar): cint; EXTDECL; external xml2lib;
+function xmlNanoFTPList(ctx: pointer; callback: ftpListCallback; userData: pointer; filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlNanoFTPGetSocket(ctx: pointer; filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlNanoFTPGet(ctx: pointer; callback: ftpDataCallback; userData: pointer; filename: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlNanoFTPRead(ctx: pointer; dest: pointer; len: cint): cint; EXTDECL; external xml2lib;
 
 {$ENDIF}

packages/libxml/src/nanohttp.inc

@@ -13,21 +13,21 @@
 {$IFDEF FUNCTION}
 procedure xmlNanoHTTPInit; EXTDECL; external xml2lib;
 procedure xmlNanoHTTPCleanup; EXTDECL; external xml2lib;
-procedure xmlNanoHTTPScanProxy(URL: pchar); EXTDECL; external xml2lib;
-function xmlNanoHTTPCleanup(URL, filename: pchar; contentType: ppchar): cint; EXTDECL; external xml2lib;
-function xmlNanoHTTPMethod(URL, method, input: pchar; contentType: ppchar; headers: pchar; ilen: cint): pointer; EXTDECL; external xml2lib;
-function xmlNanoHTTPMethodRedir(URL, method, input: pchar; contentType, redir: ppchar; headers: pchar; ilen: cint): pointer; EXTDECL; external xml2lib;
-function xmlNanoHTTPOpen(URL: pchar; contentType: ppchar): pointer; EXTDECL; external xml2lib;
-function xmlNanoHTTPOpenRedir(URL: pchar; contentType, redir: ppchar): pointer; EXTDECL; external xml2lib;
+procedure xmlNanoHTTPScanProxy(URL: PAnsiChar); EXTDECL; external xml2lib;
+function xmlNanoHTTPCleanup(URL, filename: PAnsiChar; contentType: PPAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlNanoHTTPMethod(URL, method, input: PAnsiChar; contentType: PPAnsiChar; headers: PAnsiChar; ilen: cint): pointer; EXTDECL; external xml2lib;
+function xmlNanoHTTPMethodRedir(URL, method, input: PAnsiChar; contentType, redir: PPAnsiChar; headers: PAnsiChar; ilen: cint): pointer; EXTDECL; external xml2lib;
+function xmlNanoHTTPOpen(URL: PAnsiChar; contentType: PPAnsiChar): pointer; EXTDECL; external xml2lib;
+function xmlNanoHTTPOpenRedir(URL: PAnsiChar; contentType, redir: PPAnsiChar): pointer; EXTDECL; external xml2lib;
 function xmlNanoHTTPReturnCode(ctx: pointer): cint; EXTDECL; external xml2lib;
-function xmlNanoHTTPAuthHeader(ctx: pointer): pchar; EXTDECL; external xml2lib;
-function xmlNanoHTTPRedir(ctx: pointer): pchar; EXTDECL; external xml2lib;
+function xmlNanoHTTPAuthHeader(ctx: pointer): PAnsiChar; EXTDECL; external xml2lib;
+function xmlNanoHTTPRedir(ctx: pointer): PAnsiChar; EXTDECL; external xml2lib;
 function xmlNanoHTTPContentLength(ctx: pointer): cint; EXTDECL; external xml2lib;
-function xmlNanoHTTPEncoding(ctx: pointer): pchar; EXTDECL; external xml2lib;
-function xmlNanoHTTPMimeType(ctx: pointer): pchar; EXTDECL; external xml2lib;
+function xmlNanoHTTPEncoding(ctx: pointer): PAnsiChar; EXTDECL; external xml2lib;
+function xmlNanoHTTPMimeType(ctx: pointer): PAnsiChar; EXTDECL; external xml2lib;
 function xmlNanoHTTPRead(ctx: pointer; dest: pointer; len: cint): cint; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_OUTPUT_ENABLED}
-function xmlNanoHTTPSave(ctx: pointer; filename: pchar): cint; EXTDECL; external xml2lib;
+function xmlNanoHTTPSave(ctx: pointer; filename: PAnsiChar): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_OUTPUT_ENABLED *)
 procedure xmlNanoHTTPClose(ctx: pointer); EXTDECL; external xml2lib;
 {$ENDIF}

packages/libxml/src/parserInternals.inc

@@ -53,7 +53,7 @@ var
  *
  * Macro to check the following production in the XML spec:
  *
- * [2] Char ::= #x9 | #xA | #xD | [#x20...]
+ * [2] AnsiChar ::= #x9 | #xA | #xD | [#x20...]
  * any byte character in the accepted range
  *)
 #define IS_BYTE_CHAR(c)	 xmlIsChar_ch(c)
@@ -64,7 +64,7 @@ var
  *
  * Macro to check the following production in the XML spec:
  *
- * [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+ * [2] AnsiChar ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
  *                  | [#x10000-#x10FFFF]
  * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
  *)
@@ -72,7 +72,7 @@ var
 
 (**
  * IS_CHAR_CH:
- * @c: an xmlChar (usually an unsigned char)
+ * @c: an xmlChar (usually an unsigned AnsiChar)
  *
  * Behaves like IS_CHAR on single-byte value
  *)
@@ -90,7 +90,7 @@ var
 
 (**
  * IS_BLANK_CH:
- * @c:  an xmlChar value (normally unsigned char)
+ * @c:  an xmlChar value (normally unsigned AnsiChar)
  *
  * Behaviour same as IS_BLANK
  *)
@@ -118,7 +118,7 @@ var
 
 (**
  * IS_DIGIT_CH:
- * @c:  an xmlChar value (usually an unsigned char)
+ * @c:  an xmlChar value (usually an unsigned AnsiChar)
  *
  * Behaves like IS_DIGIT but with a single byte argument
  *)
@@ -136,7 +136,7 @@ var
 
 (**
  * IS_COMBINING_CH:
- * @c:  an xmlChar (usually an unsigned char)
+ * @c:  an xmlChar (usually an unsigned AnsiChar)
  *
  * Always false (all combining chars > 0xff)
  *)
@@ -157,7 +157,7 @@ var
 
 (**
  * IS_EXTENDER_CH:
- * @c:  an xmlChar value (usually an unsigned char)
+ * @c:  an xmlChar value (usually an unsigned AnsiChar)
  *
  * Behaves like IS_EXTENDER but with a single-byte argument
  *)
@@ -187,7 +187,7 @@ var
 
 (**
  * IS_LETTER_CH:
- * @c:  an xmlChar value (normally unsigned char)
+ * @c:  an xmlChar value (normally unsigned AnsiChar)
  *
  * Macro behaves like IS_LETTER, but only check base chars
  *
@@ -226,7 +226,7 @@ var
 
 (**
  * IS_PUBIDCHAR_CH:
- * @c:  an xmlChar value (normally unsigned char)
+ * @c:  an xmlChar value (normally unsigned AnsiChar)
  *
  * Same as IS_PUBIDCHAR but for single-byte value
  *)
@@ -246,7 +246,7 @@ var
  * MOVETO_ENDTAG:
  * @p:  and UTF8 string pointer
  *
- * Skips to the next '>' char.
+ * Skips to the next '>' AnsiChar.
  *)
 #define MOVETO_ENDTAG(p)						\
     while (( *p) && ( *(p) != '>')) (p)++
@@ -255,7 +255,7 @@ var
  * MOVETO_STARTTAG:
  * @p:  and UTF8 string pointer
  *
- * Skips to the next '<' char.
+ * Skips to the next '<' AnsiChar.
  *)
 #define MOVETO_STARTTAG(p)						\
     while (( *p) && ( *(p) != '<')) (p)++
@@ -276,12 +276,12 @@ external xml2lib int EXTDECL                   xmlIsLetter     (int c);
  * Parser context.
  *)
 external xml2lib xmlParserCtxtPtr EXTDECL	
-			xmlCreateFileParserCtxt	(char *filename);
+			xmlCreateFileParserCtxt	(AnsiChar *filename);
 external xml2lib xmlParserCtxtPtr EXTDECL	
-			xmlCreateURLParserCtxt	(char *filename,
+			xmlCreateURLParserCtxt	(AnsiChar *filename,
 						 int options);
 external xml2lib xmlParserCtxtPtr EXTDECL	
-			xmlCreateMemoryParserCtxt(char *buffer,
+			xmlCreateMemoryParserCtxt(AnsiChar *buffer,
 						 int size);
 external xml2lib xmlParserCtxtPtr EXTDECL	
 			xmlCreateEntityParserCtxt(xmlChar *URL,
@@ -303,7 +303,7 @@ external xml2lib int EXTDECL
 external xml2lib void EXTDECL
 			__xmlErrEncoding	(xmlParserCtxtPtr ctxt,
 						 xmlParserErrors xmlerr,
-						 char *msg,
+						 AnsiChar *msg,
 						 xmlChar * str1,
 						 xmlChar * str2);
 {$ENDIF}
@@ -326,7 +326,7 @@ external xml2lib void EXTDECL
 			xmlFreeInputStream	(xmlParserInputPtr input);
 external xml2lib xmlParserInputPtr EXTDECL	
 			xmlNewInputFromFile	(xmlParserCtxtPtr ctxt,
-						 char *filename);
+						 AnsiChar *filename);
 external xml2lib xmlParserInputPtr EXTDECL	
 			xmlNewInputStream	(xmlParserCtxtPtr ctxt);
 
@@ -537,8 +537,8 @@ external xml2lib void EXTDECL			xmlParserInputShrink	(xmlParserInputPtr in);
  * Actually comes from the HTML parser but launched from the init stuff.
  *)
 external xml2lib void EXTDECL			htmlInitAutoClose	(void);
-external xml2lib htmlParserCtxtPtr EXTDECL	htmlCreateFileParserCtxt(char *filename,
-	                                         char *encoding);
+external xml2lib htmlParserCtxtPtr EXTDECL	htmlCreateFileParserCtxt(AnsiChar *filename,
+	                                         AnsiChar *encoding);
 {$ENDIF}
 
 (*
@@ -598,6 +598,6 @@ external xml2lib void EXTDECL
  *)
 external xml2lib void EXTDECL
 	xmlErrMemory		(xmlParserCtxtPtr ctxt,
-				 char *extra);
+				 AnsiChar *extra);
 {$ENDIF}
 {$ENDIF}

packages/libxml/src/relaxng.inc

@@ -22,8 +22,8 @@
 (**
  * A schemas validation context
  *)
-  xmlRelaxNGValidityErrorFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
-  xmlRelaxNGValidityWarningFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlRelaxNGValidityErrorFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
+  xmlRelaxNGValidityWarningFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
   xmlRelaxNGParserCtxt = record end;
 
@@ -97,8 +97,8 @@ function xmlRelaxNGCleanupTypes: cint; EXTDECL; external xml2lib;
 (*
  * Interfaces for parsing.
  *)
-function xmlRelaxNGNewParserCtxt(URL: pchar): xmlRelaxNGParserCtxtPtr; EXTDECL; external xml2lib;
-function xmlRelaxNGNewMemParserCtxt(buffer: pchar; size: cint): xmlRelaxNGParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlRelaxNGNewParserCtxt(URL: PAnsiChar): xmlRelaxNGParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlRelaxNGNewMemParserCtxt(buffer: PAnsiChar; size: cint): xmlRelaxNGParserCtxtPtr; EXTDECL; external xml2lib;
 function xmlRelaxNGNewDocParserCtxt(doc: xmlDocPtr): xmlRelaxNGParserCtxtPtr; EXTDECL; external xml2lib;
 function xmlRelaxParserSetFlag(ctxt: xmlRelaxNGParserCtxtPtr; flag: cint; doc: xmlDocPtr): cint; EXTDECL; external xml2lib;
 procedure xmlRelaxNGFreeParserCtxt(ctxt: xmlRelaxNGParserCtxtPtr); EXTDECL; external xml2lib;

packages/libxml/src/schematron.inc

@@ -36,8 +36,8 @@
 (**
  * A schemas validation context
  *)
-  xmlSchematronValidityErrorFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
-  xmlSchematronValidityWarningFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlSchematronValidityErrorFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
+  xmlSchematronValidityWarningFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
   xmlSchematronParserCtxt = record end;
 
@@ -48,8 +48,8 @@
 (*
  * Interfaces for parsing.
  *)
-function xmlSchematronNewParserCtxt(URL: pchar): xmlSchematronParserCtxtPtr; EXTDECL; external xml2lib;
-function xmlSchematronNewMemParserCtxt(buffer: pchar; size: cint): xmlSchematronParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlSchematronNewParserCtxt(URL: PAnsiChar): xmlSchematronParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlSchematronNewMemParserCtxt(buffer: PAnsiChar; size: cint): xmlSchematronParserCtxtPtr; EXTDECL; external xml2lib;
 function xmlSchematronNewDocParserCtxt(doc: xmlDocPtr): xmlSchematronParserCtxtPtr; EXTDECL; external xml2lib;
 procedure xmlSchematronFreeParserCtxt(ctxt: xmlSchematronParserCtxtPtr); EXTDECL; external xml2lib;
 (*****

packages/libxml/src/tree.inc

@@ -442,7 +442,7 @@ function XML_GET_CONTENT(n: pointer): xmlCharPtr;
   xmlDoc = record
     _private    : pointer;	(* application data *)
     _type       : xmlElementType;       (* XML_DOCUMENT_NODE, must be second ! *)
-    name        : pchar;	(* name/filename/URI of the document *)
+    name        : PAnsiChar;	(* name/filename/URI of the document *)
     children    : xmlCharPtr; (* the document tree *)
     last        : xmlCharPtr;	(* last child link *)
     parent      : xmlCharPtr;	(* child->parent link *)
@@ -568,7 +568,7 @@ procedure xmlBufferDump(fp: PFILE; buf: xmlBufferPtr); EXTDECL; external xml2lib
 function xmlBufferAdd(buf: xmlBufferPtr; str: xmlCharPtr; len: cint): cint; EXTDECL; external xml2lib;
 function xmlBufferAddHead(buf: xmlBufferPtr; str: xmlCharPtr; len: cint): cint; EXTDECL; external xml2lib;
 function xmlBufferCat(buf: xmlBufferPtr; str: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlBufferCCat(buf: xmlBufferPtr; str: pchar): cint; EXTDECL; external xml2lib;
+function xmlBufferCCat(buf: xmlBufferPtr; str: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlBufferShrink(buf: xmlBufferPtr; len: cuint): cint; EXTDECL; external xml2lib;
 function xmlBufferGrow(buf: xmlBufferPtr; len: cuint): cint; EXTDECL; external xml2lib;
 procedure xmlBufferEmpty(buf: xmlBufferPtr); EXTDECL; external xml2lib;
@@ -745,7 +745,7 @@ function xmlUnsetProp(node: xmlNodePtr; name: xmlCharPtr): cint; EXTDECL; extern
 					 xmlChar *string);
 external xml2lib void EXTDECL
 		xmlBufferWriteChar	(xmlBufferPtr buf,
-					 char *string);
+					 AnsiChar *string);
 external xml2lib void EXTDECL
 		xmlBufferWriteQuotedString(xmlBufferPtr buf,
 					 xmlChar *string);
@@ -770,19 +770,19 @@ function xmlReconciliateNs(doc: xmlDocPtr; tree: xmlNodePtr): cint; EXTDECL; ext
  *)
 procedure xmlDocDumpFormatMemory(cur: xmlDocPtr; var mem: xmlCharPtr; var size: cint; format: cint); EXTDECL; external xml2lib;
 procedure xmlDocDumpMemory(cur: xmlDocPtr; var mem: xmlCharPtr; var size: cint); EXTDECL; external xml2lib;
-procedure xmlDocDumpMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: pchar); EXTDECL; external xml2lib;
-procedure xmlDocDumpFormatMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: pchar; format: cint); EXTDECL; external xml2lib;
+procedure xmlDocDumpMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: PAnsiChar); EXTDECL; external xml2lib;
+procedure xmlDocDumpFormatMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: PAnsiChar; format: cint); EXTDECL; external xml2lib;
 function xmlDocFormatDump(f: PFILE; cur: xmlDocPtr; format: cint): cint; EXTDECL; external xml2lib;
 function xmlDocDump(f: PFILE; cur: xmlDocPtr): cint; EXTDECL; external xml2lib;
 function xmlElemDump(f: PFILE; doc: xmlDocPtr; cur: xmlNodePtr): cint; EXTDECL; external xml2lib;
-function xmlSaveFormatFile(filename: pchar; cur: xmlDocPtr; format: cint): cint; EXTDECL; external xml2lib;
-function xmlSaveFile(filename: pchar; cur: xmlDocPtr): cint; EXTDECL; external xml2lib;
+function xmlSaveFormatFile(filename: PAnsiChar; cur: xmlDocPtr; format: cint): cint; EXTDECL; external xml2lib;
+function xmlSaveFile(filename: PAnsiChar; cur: xmlDocPtr): cint; EXTDECL; external xml2lib;
 function xmlNodeDump(buf: xmlBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; level, format: cint): cint; EXTDECL; external xml2lib;
-function xmlSaveFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: pchar): cint; EXTDECL; external xml2lib;
-function xmlSaveFormatFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: pchar; format: cint): cint; EXTDECL; external xml2lib;
-procedure xmlNodeDumpOutput(buf: xmlBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; level, format: cint; encoding: pchar); EXTDECL; external xml2lib;
-function xmlSaveFormatFileEnc(filename: pchar; cur: xmlDocPtr; encoding: pchar; format: cint): cint; EXTDECL; external xml2lib;
-function xmlSaveFileEnc(filename: pchar; cur: xmlDocPtr; encoding: pchar): cint; EXTDECL; external xml2lib;
+function xmlSaveFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlSaveFormatFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: PAnsiChar; format: cint): cint; EXTDECL; external xml2lib;
+procedure xmlNodeDumpOutput(buf: xmlBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; level, format: cint; encoding: PAnsiChar); EXTDECL; external xml2lib;
+function xmlSaveFormatFileEnc(filename: PAnsiChar; cur: xmlDocPtr; encoding: PAnsiChar; format: cint): cint; EXTDECL; external xml2lib;
+function xmlSaveFileEnc(filename: PAnsiChar; cur: xmlDocPtr; encoding: PAnsiChar): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_OUTPUT_ENABLED *)
 
 (*

packages/libxml/src/uri.inc

@@ -24,17 +24,17 @@
  * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00127
  *)
   xmlUri = record
-    scheme    : pchar;	(* the URI scheme *)
-    opaque    : pchar;	(* opaque part *)
-    authority : pchar;	(* the authority part *)
-    server    : pchar;	(* the server part *)
-    user      : pchar;		(* the user part *)
+    scheme    : PAnsiChar;	(* the URI scheme *)
+    opaque    : PAnsiChar;	(* opaque part *)
+    authority : PAnsiChar;	(* the authority part *)
+    server    : PAnsiChar;	(* the server part *)
+    user      : PAnsiChar;		(* the user part *)
     port      : cint;		(* the port number *)
-    path      : pchar;		(* the path string *)
-    query     : pchar;	(* the query string (deprecated - use with caution) *)
-    fragment  : pchar;	(* the fragment identifier *)
+    path      : PAnsiChar;		(* the path string *)
+    query     : PAnsiChar;	(* the query string (deprecated - use with caution) *)
+    fragment  : PAnsiChar;	(* the fragment identifier *)
     cleanup   : cint;	(* parsing potentially unclean URI *)
-    query_raw : pchar;	(* the query string (as it appears in the URI) *)
+    query_raw : PAnsiChar;	(* the query string (as it appears in the URI) *)
   end;
 {$ENDIF}
 
@@ -47,14 +47,14 @@
 function xmlCreateURI(): xmlURIPtr; EXTDECL; external xml2lib;
 function xmlBuildURI(URI: xmlCharPtr; base: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlBuildRelativeURI(URI: xmlCharPtr; base: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
-function xmlParseURI(str: pchar): xmlURIPtr; EXTDECL; external xml2lib;
-function xmlParseURI(str: pchar; raw: cint): xmlURIPtr; EXTDECL; external xml2lib;
-function xmlParseURIReference(uri: xmlURIPtr; str: pchar): cint; EXTDECL; external xml2lib;
-function xmlSaveUri(uri: xmlURIPtr): pchar; EXTDECL; external xml2lib;
+function xmlParseURI(str: PAnsiChar): xmlURIPtr; EXTDECL; external xml2lib;
+function xmlParseURI(str: PAnsiChar; raw: cint): xmlURIPtr; EXTDECL; external xml2lib;
+function xmlParseURIReference(uri: xmlURIPtr; str: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlSaveUri(uri: xmlURIPtr): PAnsiChar; EXTDECL; external xml2lib;
 procedure xmlPrintURI(stream: PFILE; uri: xmlURIPtr); EXTDECL; external xml2lib;
 function xmlURIEscapeStr(str: xmlCharPtr; list: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
-function xmlURIUnescapeString(str: pchar; len: cint; target: pchar): xmlCharPtr; EXTDECL; external xml2lib;
-function xmlNormalizeURIPath(path: pchar): cint; EXTDECL; external xml2lib;
+function xmlURIUnescapeString(str: PAnsiChar; len: cint; target: PAnsiChar): xmlCharPtr; EXTDECL; external xml2lib;
+function xmlNormalizeURIPath(path: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlURIEscape(str: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
 procedure xmlPrintURI(uri: xmlURIPtr); EXTDECL; external xml2lib;
 function xmlCanonicPath(path: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;

packages/libxml/src/valid.inc

@@ -34,7 +34,7 @@
  * Callback called when a validity error is found. This is a message
  * oriented function similar to an *printf function.
  *)
-  xmlValidityErrorFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlValidityErrorFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (**
  * xmlValidityWarningFunc:
@@ -47,7 +47,7 @@
  * Callback called when a validity warning is found. This is a message
  * oriented function similar to an *printf function.
  *)
-  xmlValidityWarningFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlValidityWarningFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (*
  * xmlValidCtxt:
@@ -131,7 +131,7 @@ procedure xmlDumpNotationTable(buf: xmlBufferPtr; table: xmlNotationTablePtr); E
 function xmlNewDocElementContent(doc: xmlDocPtr; name: xmlCharPtr; _type: xmlElementContentType): xmlElementContentPtr; EXTDECL; external xml2lib;
 function xmlCopyDocElementContent(doc: xmlDocPtr; content: xmlElementContentPtr): xmlElementContentPtr; EXTDECL; external xml2lib;
 procedure xmlFreeDocElementContent(doc: xmlDocPtr; cur: xmlElementContentPtr); EXTDECL; external xml2lib;
-procedure xmlSnprintfElementContent(buf: pchar; size: cint; content: xmlElementContentPtr; englob: cint); EXTDECL; external xml2lib;
+procedure xmlSnprintfElementContent(buf: PAnsiChar; size: cint; content: xmlElementContentPtr; englob: cint); EXTDECL; external xml2lib;
 
 (* Element *)
 function xmlAddElementDecl(ctxt: xmlValidCtxtPtr; dtd: xmlDtdPtr; name: xmlCharPtr; _type: xmlElementTypeVal; content: xmlElementContentPtr): xmlElementPtr; EXTDECL; external xml2lib;

packages/libxml/src/xml2.pas

@@ -102,7 +102,7 @@ begin
   ReallocMem(Result, size);
 end;
 
-function fpcxmlStrdup(str: pchar): pchar; EXTDECL;
+function fpcxmlStrdup(str: PAnsiChar): PAnsiChar; EXTDECL;
 var
   L: SizeInt;
 begin
@@ -250,7 +250,7 @@ end;
  * macros from HTMLparser.inc
  *)
 
-function htmlDefaultSubelement(elt: htmlElemDescPtr): pchar;
+function htmlDefaultSubelement(elt: htmlElemDescPtr): PAnsiChar;
 begin
   Result := elt^.defaultsubelt;
 end;
@@ -260,7 +260,7 @@ begin
   Result := htmlElementAllowedHere(parent, xmlCharPtr(elt^.name));
 end;
 
-function htmlRequiredAttrs(elt: htmlElemDescPtr): ppchar;
+function htmlRequiredAttrs(elt: htmlElemDescPtr): PPAnsiChar;
 begin
   Result := elt^.attrs_req;
 end;
@@ -320,9 +320,9 @@ begin
     //__xmlParserMaxDepth := PCardinal(GetProcAddress(libHandle, 'xmlParserMaxDepth'));
    
   {  }
-   {xmlStringComment := PChar(GetProcAddress(libHandle, 'xmlStringComment'));
-    xmlStringText := PChar(GetProcAddress(libHandle, 'xmlStringText'));
-    xmlStringTextNoenc := PChar(GetProcAddress(libHandle, 'xmlStringTextNoenc'));}
+   {xmlStringComment := PAnsiChar(GetProcAddress(libHandle, 'xmlStringComment'));
+    xmlStringText := PAnsiChar(GetProcAddress(libHandle, 'xmlStringText'));
+    xmlStringTextNoenc := PAnsiChar(GetProcAddress(libHandle, 'xmlStringTextNoenc'));}
 
   { chvalid.inc }
     __xmlIsBaseCharGroup := xmlChRangeGroupPtr(GetProcAddress(libHandle, 'xmlIsBaseCharGroup'));

packages/libxml/src/xmlIO.inc

@@ -27,7 +27,7 @@
  *
  * Returns 1 if yes and 0 if another Input module should be used
  *)
-  xmlInputMatchCallback = function(filename: pchar): cint; EXTDECL;
+  xmlInputMatchCallback = function(filename: PAnsiChar): cint; EXTDECL;
 
 (**
  * xmlInputOpenCallback:
@@ -37,7 +37,7 @@
  *
  * Returns an Input context or NULL in case or error
  *)
-  xmlInputOpenCallback = function(filename: pchar): pointer; EXTDECL;
+  xmlInputOpenCallback = function(filename: PAnsiChar): pointer; EXTDECL;
 
 (**
  * xmlInputReadCallback:
@@ -49,7 +49,7 @@
  *
  * Returns the number of bytes read or -1 in case of error
  *)
-  xmlInputReadCallback = function(context: pointer; buffer: pchar; len: cint): cint; EXTDECL;
+  xmlInputReadCallback = function(context: pointer; buffer: PAnsiChar; len: cint): cint; EXTDECL;
 
 (**
  * xmlInputCloseCallback:
@@ -76,7 +76,7 @@
  *
  * Returns 1 if yes and 0 if another Output module should be used
  *)
-  xmlOutputMatchCallback = function(filename: pchar): cint; EXTDECL;
+  xmlOutputMatchCallback = function(filename: PAnsiChar): cint; EXTDECL;
 
 (**
  * xmlOutputOpenCallback:
@@ -86,7 +86,7 @@
  *
  * Returns an Output context or NULL in case or error
  *)
-  xmlOutputOpenCallback = function(filename: pchar): pointer; EXTDECL;
+  xmlOutputOpenCallback = function(filename: PAnsiChar): pointer; EXTDECL;
 
 (**
  * xmlOutputWriteCallback:
@@ -98,7 +98,7 @@
  *
  * Returns the number of bytes written or -1 in case of error
  *)
-  xmlOutputWriteCallback = function(context: pointer; buffer: pchar; len: cint): cint; EXTDECL;
+  xmlOutputWriteCallback = function(context: pointer; buffer: PAnsiChar; len: cint): cint; EXTDECL;
 
 (**
  * xmlOutputCloseCallback:
@@ -145,20 +145,20 @@ procedure xmlCleanupInputCallbacks; EXTDECL; external xml2lib;
 function xmlPopInputCallbacks: cint; EXTDECL; external xml2lib;
 procedure xmlRegisterDefaultInputCallbacks; EXTDECL; external xml2lib;
 function xmlAllocParserInputBuffer(enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
-function xmlParserInputBufferCreateFilename(URI: pchar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
+function xmlParserInputBufferCreateFilename(URI: PAnsiChar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
 function xmlParserInputBufferCreateFile(fp: PFILE; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
 function xmlParserInputBufferCreateFd(fd: cint; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
-function xmlParserInputBufferCreateMem(mem: pchar; size: cint; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
-function xmlParserInputBufferCreateStatic(mem: pchar; size: cint; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
+function xmlParserInputBufferCreateMem(mem: PAnsiChar; size: cint; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
+function xmlParserInputBufferCreateStatic(mem: PAnsiChar; size: cint; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
 
 function xmlParserInputBufferCreateIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
 function xmlParserInputBufferRead(_in: xmlParserInputBufferPtr; len: cint): cint; EXTDECL; external xml2lib;
 function xmlParserInputBufferGrow(_in: xmlParserInputBufferPtr; len: cint): cint; EXTDECL; external xml2lib;
-function xmlParserInputBufferPush(_in: xmlParserInputBufferPtr; len: cint; buf: pchar): cint; EXTDECL; external xml2lib;
+function xmlParserInputBufferPush(_in: xmlParserInputBufferPtr; len: cint; buf: PAnsiChar): cint; EXTDECL; external xml2lib;
 procedure xmlFreeParserInputBuffer(_in: xmlParserInputBufferPtr); EXTDECL; external xml2lib;
-function xmlParserGetDirectory(filename: pchar): pchar; EXTDECL; external xml2lib;
+function xmlParserGetDirectory(filename: PAnsiChar): PAnsiChar; EXTDECL; external xml2lib;
 function xmlRegisterInputCallbacks(matchFunc: xmlInputMatchCallback; openFunc: xmlInputOpenCallback; readFunc: xmlInputReadCallback; closeFunc: xmlInputCloseCallback): cint; EXTDECL; external xml2lib;
-function __xmlParserInputBufferCreateFilename(URI: pchar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
+function __xmlParserInputBufferCreateFilename(URI: PAnsiChar; enc: xmlCharEncoding): xmlParserInputBufferPtr; EXTDECL; external xml2lib;
 
 {$IFDEF LIBXML_OUTPUT_ENABLED}
 (*
@@ -168,18 +168,18 @@ procedure xmlCleanupOutputCallbacks; EXTDECL; external xml2lib;
 procedure xmlRegisterDefaultOutputCallbacks; EXTDECL; external xml2lib;
 function xmlAllocOutputBuffer(encoder: xmlCharEncodingHandlerPtr): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 
-function xmlOutputBufferCreateFilename(URI: pchar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL; external xml2lib;
+function xmlOutputBufferCreateFilename(URI: PAnsiChar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 function xmlOutputBufferCreateFile(fp: PFILE; encoder: xmlCharEncodingHandlerPtr): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 function xmlOutputBufferCreateBuffer(buffer: xmlBufferPtr; encoder: xmlCharEncodingHandlerPtr): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 function xmlOutputBufferCreateFd(fd: cint; encoder: xmlCharEncodingHandlerPtr): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 function xmlOutputBufferCreateIO(iowrite: xmlOutputWriteCallback; ioclose: xmlOutputCloseCallback; ioctx: pointer; encoder: xmlCharEncodingHandlerPtr): xmlOutputBufferPtr; EXTDECL; external xml2lib;
-function xmlOutputBufferWrite(_out: xmlOutputBufferPtr; len: cint; buf: pchar): cint; EXTDECL; external xml2lib;
-function xmlOutputBufferWriteString(_out: xmlOutputBufferPtr; str: pchar): cint; EXTDECL; external xml2lib;
+function xmlOutputBufferWrite(_out: xmlOutputBufferPtr; len: cint; buf: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlOutputBufferWriteString(_out: xmlOutputBufferPtr; str: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlOutputBufferWriteEscape(_out: xmlOutputBufferPtr; str: xmlCharPtr; escaping: xmlCharEncodingOutputFunc): cint; EXTDECL; external xml2lib;
 function xmlOutputBufferFlush(_out: xmlOutputBufferPtr): cint; EXTDECL; external xml2lib;
 function xmlOutputBufferClose(_out: xmlOutputBufferPtr): cint; EXTDECL; external xml2lib;
 function xmlRegisterOutputCallbacks(matchFunc: xmlOutputMatchCallback; openFunc: xmlOutputOpenCallback; writeFunc: xmlOutputWriteCallback; closeFunc: xmlOutputCloseCallback): cint; EXTDECL; external xml2lib;
-function __xmlOutputBufferCreateFilename(URI: pchar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL; external xml2lib;
+function __xmlOutputBufferCreateFilename(URI: PAnsiChar; encoder: xmlCharEncodingHandlerPtr; compression: cint): xmlOutputBufferPtr; EXTDECL; external xml2lib;
 
 {$IFDEF LIBXML_HTTP_ENABLED}
 (*  This function only exists if HTTP support built into the library  *)
@@ -192,31 +192,31 @@ function xmlCheckHTTPInput(ctxt: xmlParserCtxtPtr; ret: xmlParserInputPtr): xmlP
 (*
  * A predefined entity loader disabling network accesses
  *)
-function xmlNoNetExternalEntityLoader(URL: pchar; ID: pchar; ctxt: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL; external xml2lib;
+function xmlNoNetExternalEntityLoader(URL: PAnsiChar; ID: PAnsiChar; ctxt: xmlParserCtxtPtr): xmlParserInputPtr; EXTDECL; external xml2lib;
 
 (*
  * Check xmlCanonicPath in uri.h for a better alternative.
  *)
-function xmlCheckFilename(path: pchar): cint; EXTDECL; external xml2lib;
+function xmlCheckFilename(path: PAnsiChar): cint; EXTDECL; external xml2lib;
 
 (**
  * Default 'file://' protocol callbacks
  *)
-function xmlFileMatch(filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlFileOpen(filename: pchar): pointer; EXTDECL; external xml2lib;
-function xmlFileRead(context: pointer; buffer: pchar; len: cint): cint; EXTDECL; external xml2lib;
+function xmlFileMatch(filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlFileOpen(filename: PAnsiChar): pointer; EXTDECL; external xml2lib;
+function xmlFileRead(context: pointer; buffer: PAnsiChar; len: cint): cint; EXTDECL; external xml2lib;
 function xmlFileClose(context: pointer): cint; EXTDECL; external xml2lib;
 
 (**
  * Default 'http://' protocol callbacks
  *)
 {$IFDEF LIBXML_HTTP_ENABLED}
-function xmlIOHTTPMatch(filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlIOHTTPOpen(filename: pchar): pointer; EXTDECL; external xml2lib;
+function xmlIOHTTPMatch(filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlIOHTTPOpen(filename: PAnsiChar): pointer; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_OUTPUT_ENABLED}
-function xmlIOHTTPOpenW(post_uri: pchar; compression: cint): pointer; EXTDECL; external xml2lib;
+function xmlIOHTTPOpenW(post_uri: PAnsiChar; compression: cint): pointer; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_OUTPUT_ENABLED *)
-function xmlIOHTTPRead(context: pointer; buffer: pchar; len: cint): cint; EXTDECL; external xml2lib;
+function xmlIOHTTPRead(context: pointer; buffer: PAnsiChar; len: cint): cint; EXTDECL; external xml2lib;
 function xmlIOHTTPClose(context: pointer): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_HTTP_ENABLED *)
 
@@ -224,9 +224,9 @@ function xmlIOHTTPClose(context: pointer): cint; EXTDECL; external xml2lib;
  * Default 'ftp://' protocol callbacks
  *)
 {$IFDEF LIBXML_FTP_ENABLED}
-function xmlIOFTPMatch(filename: pchar): cint; EXTDECL; external xml2lib;
-function xmlIOFTPOpen(filename: pchar): pointer; EXTDECL; external xml2lib;
-function xmlIOFTPRead(context: pointer; buffer: pchar; len: cint): cint; EXTDECL; external xml2lib;
+function xmlIOFTPMatch(filename: PAnsiChar): cint; EXTDECL; external xml2lib;
+function xmlIOFTPOpen(filename: PAnsiChar): pointer; EXTDECL; external xml2lib;
+function xmlIOFTPRead(context: pointer; buffer: PAnsiChar; len: cint): cint; EXTDECL; external xml2lib;
 function xmlIOFTPClose(context: pointer): cint; EXTDECL; external xml2lib;
 {$ENDIF} (* LIBXML_FTP_ENABLED *)
 {$ENDIF}

packages/libxml/src/xmlerror.inc

@@ -70,13 +70,13 @@
   xmlError = record
     domain    : cint;	(* What part of the library raised this error *)
     code      : cint;	(* The error code, e.g. an xmlParserError *)
-    message   : pchar;(* human-readable informative error message *)
+    message   : PAnsiChar;(* human-readable informative error message *)
     level     : xmlErrorLevel;(* how consequent is the error *)
-    _file     : pchar;	(* the filename *)
+    _file     : PAnsiChar;	(* the filename *)
     line      : cint;	(* the line number if available *)
-    str1      : pchar;	(* extra string information *)
-    str2      : pchar;	(* extra string information *)
-    str3      : pchar;	(* extra string information *)
+    str1      : PAnsiChar;	(* extra string information *)
+    str2      : PAnsiChar;	(* extra string information *)
+    str3      : PAnsiChar;	(* extra string information *)
     int1      : cint;	(* extra number information *)
     int2      : cint;	(* column number of the error or 0 if N/A (todo: rename this field when we would break ABI) *)
     ctxt      : pointer;   (* the parser context if available *)
@@ -829,7 +829,7 @@
  * Signature of the function to use when there is an error and
  * no parsing or validity context available .
  *)
-  xmlGenericErrorFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlGenericErrorFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
 (**
  * xmlStructuredErrorFunc:
@@ -856,10 +856,10 @@ procedure xmlSetStructuredErrorFunc(ctx: pointer; handler: xmlStructuredErrorFun
  * Default message routines used by SAX and Valid context for error
  * and warning reporting.
  *)
-procedure xmlParserError(ctx: pointer; msg: pchar; args: array of const); EXTDECL; external xml2lib;
-procedure xmlParserWarning(ctx: pointer; msg: pchar; args: array of const); EXTDECL; external xml2lib;
-procedure xmlParserValidityError(ctx: pointer; msg: pchar; args: array of const); EXTDECL; external xml2lib;
-procedure xmlParserValidityWarning(ctx: pointer; msg: pchar; args: array of const); EXTDECL; external xml2lib;
+procedure xmlParserError(ctx: pointer; msg: PAnsiChar; args: array of const); EXTDECL; external xml2lib;
+procedure xmlParserWarning(ctx: pointer; msg: PAnsiChar; args: array of const); EXTDECL; external xml2lib;
+procedure xmlParserValidityError(ctx: pointer; msg: PAnsiChar; args: array of const); EXTDECL; external xml2lib;
+procedure xmlParserValidityWarning(ctx: pointer; msg: PAnsiChar; args: array of const); EXTDECL; external xml2lib;
 procedure xmlParserPrintFileInfo(input: xmlParserInputPtr); EXTDECL; external xml2lib;
 procedure xmlParserPrintFileContext(input: xmlParserInputPtr); EXTDECL; external xml2lib;
 
@@ -885,14 +885,14 @@ procedure __xmlRaiseError(
   domain: cint;
   code: cint;
   level: xmlErrorLevel;
-  _file: pchar;
+  _file: PAnsiChar;
   line: cint;
-  str1: pchar;
-  str2: pchar;
-  str3: pchar;
+  str1: PAnsiChar;
+  str2: PAnsiChar;
+  str3: PAnsiChar;
   int1: cint;
   col: cint;
-  msg: pchar;
+  msg: PAnsiChar;
   args: array of const
 ); EXTDECL; external xml2lib;
 
@@ -900,7 +900,7 @@ procedure __xmlSimpleError(
   domain: cint;
   code: cint;
   node: xmlNodePtr;
-  msg: pchar;
-  extra: pchar
+  msg: PAnsiChar;
+  extra: PAnsiChar
 ); EXTDECL; external xml2lib;
 {$ENDIF}

packages/libxml/src/xmlmemory.inc

@@ -84,7 +84,7 @@
  *
  * Returns the copy of the string or NULL in case of error.
  *)
-  xmlStrdupFunc = function(str: pchar): pchar; EXTDECL;
+  xmlStrdupFunc = function(str: PAnsiChar): PAnsiChar; EXTDECL;
   {$IFDEF NO_EXTERNAL_VARS}
   PxmlStrdupFunc = ^xmlStrdupFunc;
   {$ENDIF}
@@ -131,12 +131,12 @@ procedure xmlMemoryDump(); EXTDECL; external xml2lib;
 function xmlMemMalloc(size: csize_t): pointer; EXTDECL; external xml2lib;
 function xmlMemRealloc(ptr: pointer; size: csize_t): pointer; EXTDECL; external xml2lib;
 procedure xmlMemFree(ptr: pointer); EXTDECL; external xml2lib;
-function xmlMemoryStrdup(str: pchar): pchar; EXTDECL; external xml2lib;
+function xmlMemoryStrdup(str: PAnsiChar): PAnsiChar; EXTDECL; external xml2lib;
 
-function xmlMallocLoc(size: csize_t; _file: pchar; line: cint): pointer; EXTDECL; external xml2lib;
-function xmlReallocLoc(ptr: pointer; size: csize_t; _file: pchar; line: cint): pointer; EXTDECL; external xml2lib;
-function xmlMallocAtomicLoc(size: csize_t; _file: pchar; line: cint): pointer; EXTDECL; external xml2lib;
-function xmlMemStrdupLoc(str: pchar; _file: pchar; line: cint): pchar; EXTDECL; external xml2lib;
+function xmlMallocLoc(size: csize_t; _file: PAnsiChar; line: cint): pointer; EXTDECL; external xml2lib;
+function xmlReallocLoc(ptr: pointer; size: csize_t; _file: PAnsiChar; line: cint): pointer; EXTDECL; external xml2lib;
+function xmlMallocAtomicLoc(size: csize_t; _file: PAnsiChar; line: cint): pointer; EXTDECL; external xml2lib;
+function xmlMemStrdupLoc(str: PAnsiChar; _file: PAnsiChar; line: cint): PAnsiChar; EXTDECL; external xml2lib;
 
 {$IFDEF DEBUG_MEMORY_LOCATION}
 (**

packages/libxml/src/xmlmodule.inc

@@ -34,8 +34,8 @@
 {$ENDIF}
 
 {$IFDEF FUNCTION}
-function xmlModuleOpen(filename: char; options: cint): xmlModulePtr; EXTDECL; external xml2lib;
-function xmlModuleSymbol(module: xmlModulePtr; name: pchar; var result: pointer): cint; EXTDECL; external xml2lib;
+function xmlModuleOpen(filename: AnsiChar; options: cint): xmlModulePtr; EXTDECL; external xml2lib;
+function xmlModuleSymbol(module: xmlModulePtr; name: PAnsiChar; var result: pointer): cint; EXTDECL; external xml2lib;
 function xmlModuleClose(module: xmlModulePtr): cint; EXTDECL; external xml2lib;
 function xmlModuleFree(module: xmlModulePtr): cint; EXTDECL; external xml2lib;
 {$ENDIF}

packages/libxml/src/xmlreader.inc

@@ -91,17 +91,17 @@
 
   xmlTextReaderLocatorPtr = pointer;
 
-  xmlTextReaderErrorFunc = procedure(arg: pointer; msg: pchar; severity: xmlParserSeverities; locator: xmlTextReaderLocatorPtr); EXTDECL;
+  xmlTextReaderErrorFunc = procedure(arg: pointer; msg: PAnsiChar; severity: xmlParserSeverities; locator: xmlTextReaderLocatorPtr); EXTDECL;
 {$ENDIF}
 
 {$IFDEF FUNCTION}
 (*
  * Constructors & Destructor
  *)
-function xmlNewTextReader(input: xmlParserInputBufferPtr; URI: pchar): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlNewTextReaderFilename(URI: pchar): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlNewTextReader(input: xmlParserInputBufferPtr; URI: PAnsiChar): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlNewTextReaderFilename(URI: PAnsiChar): xmlTextReaderPtr; EXTDECL; external xml2lib;
 procedure xmlFreeTextReader(reader: xmlTextReaderPtr); EXTDECL; external xml2lib;
-function xmlTextReaderSetup(reader: xmlTextReaderPtr; input: xmlParserInputBufferPtr; URL, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlTextReaderSetup(reader: xmlTextReaderPtr; input: xmlParserInputBufferPtr; URL, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
 
 (*
  * Iterators
@@ -186,9 +186,9 @@ function xmlTextReaderNextSibling(reader: xmlTextReaderPtr): cint; EXTDECL; exte
 function xmlTextReaderIsValid(reader: xmlTextReaderPtr): cint; EXTDECL; external xml2lib;
 {$IFDEF LIBXML_SCHEMAS_ENABLED}
 
-function xmlTextReaderRelaxNGValidate(reader: xmlTextReaderPtr; rng: pchar): cint; EXTDECL; external xml2lib;
+function xmlTextReaderRelaxNGValidate(reader: xmlTextReaderPtr; rng: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlTextReaderRelaxNGSetSchema(reader: xmlTextReaderPtr; schema: xmlRelaxNGPtr): cint; EXTDECL; external xml2lib;
-function xmlTextReaderSchemaValidate(reader: xmlTextReaderPtr; xsd: pchar): cint; EXTDECL; external xml2lib;
+function xmlTextReaderSchemaValidate(reader: xmlTextReaderPtr; xsd: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlTextReaderSchemaValidateCtxt(reader: xmlTextReaderPtr; ctxt: xmlSchemaValidCtxtPtr; options: cint): cint; EXTDECL; external xml2lib;
 function xmlTextReaderSetSchema(reader: xmlTextReaderPtr; schema: xmlSchemaPtr): cint; EXTDECL; external xml2lib;
 {$ENDIF}
@@ -204,18 +204,18 @@ function xmlTextReaderByteConsumed(reader: xmlTextReaderPtr): clong; EXTDECL; ex
  * New more complete APIs for simpler creation and reuse of readers
  *)
 function xmlReaderWalker(doc: xmlDocPtr): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlReaderForDoc(cur: xmlCharPtr; URL, encoding: pchar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlReaderForFile(filename, encoding: pchar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlReaderForMemory(buffer: pchar; size: cint; URL, encoding: pchar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlReaderForFd(fd: cint; URL, encoding: pchar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
-function xmlReaderForIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: pchar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlReaderForDoc(cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlReaderForFile(filename, encoding: PAnsiChar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlReaderForMemory(buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlReaderForFd(fd: cint; URL, encoding: PAnsiChar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
+function xmlReaderForIO(ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: PAnsiChar; options: cint): xmlTextReaderPtr; EXTDECL; external xml2lib;
 
 function xmlReaderNewWalker(reader: xmlTextReaderPtr; doc: xmlDocPtr): cint; EXTDECL; external xml2lib;
-function xmlReaderNewDoc(reader: xmlTextReaderPtr; cur: xmlCharPtr; URL, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
-function xmlReaderNewFile(reader: xmlTextReaderPtr; filename, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
-function xmlReaderNewMemory(reader: xmlTextReaderPtr; buffer: pchar; size: cint; URL, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
-function xmlReaderNewFd(reader: xmlTextReaderPtr; fd: cint; URL, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
-function xmlReaderNewIO(reader: xmlTextReaderPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: pchar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlReaderNewDoc(reader: xmlTextReaderPtr; cur: xmlCharPtr; URL, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlReaderNewFile(reader: xmlTextReaderPtr; filename, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlReaderNewMemory(reader: xmlTextReaderPtr; buffer: PAnsiChar; size: cint; URL, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlReaderNewFd(reader: xmlTextReaderPtr; fd: cint; URL, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlReaderNewIO(reader: xmlTextReaderPtr; ioread: xmlInputReadCallback; ioclose: xmlInputCloseCallback; ioctx: pointer; URL, encoding: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
 
 (*
  * Error handling extensions

packages/libxml/src/xmlregexp.inc

@@ -109,7 +109,7 @@ procedure xmlExpRef(expr: xmlExpNodePtr); EXTDECL; external xml2lib;
 (*
  * constructors can be either manual or from a string
  *)
-function xmlExpParse(ctxt: xmlExpCtxtPtr; expr: pchar): xmlExpNodePtr; EXTDECL; external xml2lib;
+function xmlExpParse(ctxt: xmlExpCtxtPtr; expr: PAnsiChar): xmlExpNodePtr; EXTDECL; external xml2lib;
 function xmlExpNewAtom(ctxt: xmlExpCtxtPtr; name: xmlCharPtr; len: cint): xmlExpNodePtr; EXTDECL; external xml2lib;
 function xmlExpNewOr(ctxt: xmlExpCtxtPtr; left, right: xmlExpNodePtr): xmlExpNodePtr; EXTDECL; external xml2lib;
 function xmlExpNewSeq(ctxt: xmlExpCtxtPtr; left, right: xmlExpNodePtr): xmlExpNodePtr; EXTDECL; external xml2lib;

packages/libxml/src/xmlsave.inc

@@ -33,10 +33,10 @@
 {$ENDIF}
 
 {$IFDEF FUNCTION}
-function xmlSaveToFd(fd: cint; encoding: pchar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
-function xmlSaveToFilename(filename: pchar; encoding: pchar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
-function xmlSaveToBuffer(buffer: xmlBufferPtr; encoding: pchar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
-function xmlSaveToIO(iowrite: xmlOutputWriteCallback; ioclose: xmlOutputCloseCallback; ioctx: pointer; encoding: pchar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
+function xmlSaveToFd(fd: cint; encoding: PAnsiChar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
+function xmlSaveToFilename(filename: PAnsiChar; encoding: PAnsiChar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
+function xmlSaveToBuffer(buffer: xmlBufferPtr; encoding: PAnsiChar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
+function xmlSaveToIO(iowrite: xmlOutputWriteCallback; ioclose: xmlOutputCloseCallback; ioctx: pointer; encoding: PAnsiChar; options: cint): xmlSaveCtxtPtr; EXTDECL; external xml2lib;
 
 function xmlSaveDoc(ctxt: xmlSaveCtxtPtr; doc: xmlDocPtr): clong; EXTDECL; external xml2lib;
 function xmlSaveTree(ctxt: xmlSaveCtxtPtr; node: xmlNodePtr): clong; EXTDECL; external xml2lib;

packages/libxml/src/xmlschemas.inc

@@ -86,8 +86,8 @@
 (**
  * A schemas validation context
  *)
-  xmlSchemaValidityErrorFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
-  xmlSchemaValidityWarningFunc = procedure(ctx: pointer; msg: pchar); cdecl; varargs;
+  xmlSchemaValidityErrorFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
+  xmlSchemaValidityWarningFunc = procedure(ctx: pointer; msg: PAnsiChar); cdecl; varargs;
 
   xmlSchemaParserCtxt = record end;
 
@@ -100,8 +100,8 @@
 (*
  * Interfaces for parsing.
  *)
-function xmlSchemaNewParserCtxt(URL: pchar): xmlSchemaParserCtxtPtr; EXTDECL; external xml2lib;
-function xmlSchemaNewMemParserCtxt(buffer: pchar; size: cint): xmlSchemaParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlSchemaNewParserCtxt(URL: PAnsiChar): xmlSchemaParserCtxtPtr; EXTDECL; external xml2lib;
+function xmlSchemaNewMemParserCtxt(buffer: PAnsiChar; size: cint): xmlSchemaParserCtxtPtr; EXTDECL; external xml2lib;
 function xmlSchemaNewDocParserCtxt(doc: xmlDocPtr): xmlSchemaParserCtxtPtr; EXTDECL; external xml2lib;
 procedure xmlSchemaFreeParserCtxt(ctxt: xmlSchemaParserCtxtPtr); EXTDECL; external xml2lib;
 procedure xmlSchemaSetParserErrors(ctxt: xmlSchemaParserCtxtPtr; err: xmlSchemaValidityErrorFunc; warn: xmlSchemaValidityWarningFunc; ctx: pointer); EXTDECL; external xml2lib;
@@ -127,7 +127,7 @@ procedure xmlSchemaFreeValidCtxt(ctxt: xmlSchemaValidCtxtPtr); EXTDECL; external
 function xmlSchemaNewValidCtxt(ctxt: xmlSchemaValidCtxtPtr; instance: xmlDocPtr): cint; EXTDECL; external xml2lib;
 function xmlSchemaValidateOneElement(ctxt: xmlSchemaValidCtxtPtr; elem: xmlNodePtr): cint; EXTDECL; external xml2lib;
 function xmlSchemaValidateStream(ctxt: xmlSchemaValidCtxtPtr; input: xmlParserInputBufferPtr; enc: xmlCharEncoding; sax: xmlSAXHandlerPtr; user_data: pointer): cint; EXTDECL; external xml2lib;
-function xmlSchemaValidateFile(ctxt: xmlSchemaValidCtxtPtr; filename: pchar; options: cint): cint; EXTDECL; external xml2lib;
+function xmlSchemaValidateFile(ctxt: xmlSchemaValidCtxtPtr; filename: PAnsiChar; options: cint): cint; EXTDECL; external xml2lib;
 
 (*
  * Interface to insert Schemas SAX velidation in a SAX stream

packages/libxml/src/xmlstring.inc

@@ -9,8 +9,8 @@
  *)
 
 {$IFDEF POINTER}
-  xmlCharPtr = PChar;
-  xmlCharPtrPtr = PPChar;
+  xmlCharPtr = PAnsiChar;
+  xmlCharPtrPtr = PPAnsiChar;
 {$ENDIF}
 
 {$IFDEF TYPE}
@@ -18,10 +18,10 @@
  * xmlChar:
  *
  * This is a basic byte in an UTF-8 encoded string.
- * It's unsigned allowing to pinpoint case where char * are assigned
+ * It's unsigned allowing to pinpoint case where AnsiChar * are assigned
  * to xmlChar * (possibly making serialization back impossible).
  *)
-  xmlChar = Char;
+  xmlChar = AnsiChar;
 {$ENDIF}
 
 {$IFDEF FUNCTION}
@@ -37,8 +37,8 @@
  *)
 function xmlStrdup(cur: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlStrndup(cur: xmlCharPtr; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
-function xmlCharStrndup(cur: pchar; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
-function xmlCharStrdup(cur: pchar): xmlCharPtr; EXTDECL; external xml2lib;
+function xmlCharStrndup(cur: PAnsiChar; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
+function xmlCharStrdup(cur: PAnsiChar): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlStrsub(str: xmlCharPtr; start: cint; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlStrchr(str: xmlCharPtr; val: xmlChar): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlStrstr(str: xmlCharPtr; val: xmlCharPtr): xmlCharPtr; EXTDECL; external xml2lib;
@@ -55,8 +55,8 @@ function xmlStrncat(cur: xmlCharPtr; add: xmlCharPtr; len: cint): xmlCharPtr; EX
 function xmlStrncatNew(str1: xmlCharPtr; str2: xmlCharPtr; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlStrPrintf(buf: xmlCharPtr; len: cint; msg: xmlCharPtr; args: array of const): cint; cdecl; external xml2lib;
 function xmlStrVPrintf(buf: xmlCharPtr; len: cint; msg: xmlCharPtr; ap: va_list): cint; EXTDECL; external xml2lib;
-function xmlGetUTF8Char(utf: pchar; len: pcint): cint; EXTDECL; external xml2lib;
-function xmlCheckUTF8(utf: pchar): cint; EXTDECL; external xml2lib;
+function xmlGetUTF8Char(utf: PAnsiChar; len: pcint): cint; EXTDECL; external xml2lib;
+function xmlCheckUTF8(utf: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlUTF8Strsize(utf: xmlCharPtr; len: cint): cint; EXTDECL; external xml2lib;
 function xmlUTF8Strndup(utf: xmlCharPtr; len: cint): xmlCharPtr; EXTDECL; external xml2lib;
 function xmlUTF8Strpos(utf: xmlCharPtr; pos: cint): xmlCharPtr; EXTDECL; external xml2lib;

packages/libxml/src/xmlunicode.inc

@@ -144,7 +144,7 @@ function xmlUCSIsYiRadicals	(code: cint): cint; EXTDECL; external xml2lib;
 function xmlUCSIsYiSyllables	(code: cint): cint; EXTDECL; external xml2lib;
 function xmlUCSIsYijingHexagramSymbols	(code: cint): cint; EXTDECL; external xml2lib;
 
-function xmlUCSIsBlock	(code: cint; block: pchar): cint; EXTDECL; external xml2lib;
+function xmlUCSIsBlock	(code: cint; block: PAnsiChar): cint; EXTDECL; external xml2lib;
 
 function xmlUCSIsCatC	(code: cint): cint; EXTDECL; external xml2lib;
 function xmlUCSIsCatCc	(code: cint): cint; EXTDECL; external xml2lib;
@@ -183,7 +183,7 @@ function xmlUCSIsCatZl	(code: cint): cint; EXTDECL; external xml2lib;
 function xmlUCSIsCatZp	(code: cint): cint; EXTDECL; external xml2lib;
 function xmlUCSIsCatZs	(code: cint): cint; EXTDECL; external xml2lib;
 
-function xmlUCSIsCat  (code: cint; cat: pchar): cint; EXTDECL; external xml2lib;
+function xmlUCSIsCat  (code: cint; cat: PAnsiChar): cint; EXTDECL; external xml2lib;
 {$ENDIF}
 
 {$ENDIF} (* LIBXML_UNICODE_ENABLED *)

packages/libxml/src/xmlwriter.inc

@@ -23,7 +23,7 @@
  * Constructors & Destructor
  *)
 function xmlNewTextWriter(_out: xmlOutputBufferPtr): xmlTextWriterPtr; EXTDECL; external xml2lib;
-function xmlNewTextWriterFilename(uri: pchar; compression: cint): xmlTextWriterPtr; EXTDECL; external xml2lib;
+function xmlNewTextWriterFilename(uri: PAnsiChar; compression: cint): xmlTextWriterPtr; EXTDECL; external xml2lib;
 function xmlNewTextWriterMemory(buf: xmlBufferPtr; compression: cint): xmlTextWriterPtr; EXTDECL; external xml2lib;
 function xmlNewTextWriterPushParser(ctxt: xmlParserCtxtPtr; compression: cint): xmlTextWriterPtr; EXTDECL; external xml2lib;
 function xmlNewTextWriterDoc(var doc: xmlDocPtr; compression: cint): xmlTextWriterPtr; EXTDECL; external xml2lib;
@@ -37,7 +37,7 @@ procedure xmlFreeTextWriter(writer: xmlTextWriterPtr); EXTDECL; external xml2lib
 (*
  * Document
  *)
-function xmlTextWriterStartDocument(writer: xmlTextWriterPtr; version, encoding, standalone: pchar): cint; EXTDECL; external xml2lib;
+function xmlTextWriterStartDocument(writer: xmlTextWriterPtr; version, encoding, standalone: PAnsiChar): cint; EXTDECL; external xml2lib;
 function xmlTextWriterEndDocument(writer: xmlTextWriterPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -45,8 +45,8 @@ function xmlTextWriterEndDocument(writer: xmlTextWriterPtr): cint; EXTDECL; exte
  *)
 function xmlTextWriterStartComment(writer: xmlTextWriterPtr): cint; EXTDECL; external xml2lib;
 function xmlTextWriterEndComment(writer: xmlTextWriterPtr): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteFormatComment(writer: xmlTextWriterPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatComment(writer: xmlTextWriterPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatComment(writer: xmlTextWriterPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatComment(writer: xmlTextWriterPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteComment(writer: xmlTextWriterPtr; content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -60,25 +60,25 @@ function xmlTextWriterFullEndElement(writer: xmlTextWriterPtr): cint; EXTDECL; e
 (*
  * Elements conveniency functions
  *)
-function xmlTextWriterWriteFormatElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteElement(writer: xmlTextWriterPtr; name, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteFormatElementNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatElementNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatElementNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatElementNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteElementNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
  * Text
  *)
-function xmlTextWriterWriteFormatRaw(writer: xmlTextWriterPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatRaw(writer: xmlTextWriterPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatRaw(writer: xmlTextWriterPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatRaw(writer: xmlTextWriterPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteRawLen(writer: xmlTextWriterPtr; content: xmlCharPtr; len: cint): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteRaw(writer: xmlTextWriterPtr; content: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteFormatString(writer: xmlTextWriterPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatString(writer: xmlTextWriterPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatString(writer: xmlTextWriterPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatString(writer: xmlTextWriterPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteString(writer: xmlTextWriterPtr; content: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteBase64(writer: xmlTextWriterPtr; data: pchar; start, len: cint): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteBinHex(writer: xmlTextWriterPtr; data: pchar; start, len: cint): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteBase64(writer: xmlTextWriterPtr; data: PAnsiChar; start, len: cint): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteBinHex(writer: xmlTextWriterPtr; data: PAnsiChar; start, len: cint): cint; EXTDECL; external xml2lib;
 
 (*
  * Attributes
@@ -90,11 +90,11 @@ function xmlTextWriterEndAttribute(writer: xmlTextWriterPtr): cint; EXTDECL; ext
 (*
  * Attributes conveniency functions
  *)
-function xmlTextWriterWriteFormatAttribute(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatAttribute(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatAttribute(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatAttribute(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteAttribute(writer: xmlTextWriterPtr; name, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteFormatAttributeNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatAttributeNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatAttributeNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatAttributeNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteAttributeNS(writer: xmlTextWriterPtr; prefix, name, namespaceURI, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -106,8 +106,8 @@ function xmlTextWriterEndPI(writer: xmlTextWriterPtr): cint; EXTDECL; external x
 (*
  * PI conveniency functions
  *)
-function xmlTextWriterWriteFormatPI(writer: xmlTextWriterPtr; target: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatPI(writer: xmlTextWriterPtr; target: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatPI(writer: xmlTextWriterPtr; target: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatPI(writer: xmlTextWriterPtr; target: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWritePI(writer: xmlTextWriterPtr; target, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (**
@@ -126,8 +126,8 @@ function xmlTextWriterEndCDATA(writer: xmlTextWriterPtr): cint; EXTDECL; externa
 (*
  * CDATA conveniency functions
  *)
-function xmlTextWriterWriteFormatCDATA(writer: xmlTextWriterPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatCDATA(writer: xmlTextWriterPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatCDATA(writer: xmlTextWriterPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatCDATA(writer: xmlTextWriterPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteCDATA(writer: xmlTextWriterPtr; content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -139,8 +139,8 @@ function xmlTextWriterEndDTD(writer: xmlTextWriterPtr): cint; EXTDECL; external
 (*
  * DTD conveniency functions
  *)
-function xmlTextWriterWriteFormatDTD(writer: xmlTextWriterPtr; name, pubid, sysid: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatDTD(writer: xmlTextWriterPtr; name, pubid, sysid: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatDTD(writer: xmlTextWriterPtr; name, pubid, sysid: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatDTD(writer: xmlTextWriterPtr; name, pubid, sysid: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTD(writer: xmlTextWriterPtr; name, pubid, sysid, subset: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (**
@@ -159,8 +159,8 @@ function xmlTextWriterEndDTDElement(writer: xmlTextWriterPtr): cint; EXTDECL; ex
 (*
  * DTD element definition conveniency functions
  *)
-function xmlTextWriterWriteFormatDTDElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatDTDElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatDTDElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatDTDElement(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTDElement(writer: xmlTextWriterPtr; name, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -172,8 +172,8 @@ function xmlTextWriterEndDTDAttlist(writer: xmlTextWriterPtr): cint; EXTDECL; ex
 (*
  * DTD attribute list definition conveniency functions
  *)
-function xmlTextWriterWriteFormatDTDAttlist(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatDTDAttlist(writer: xmlTextWriterPtr; name: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatDTDAttlist(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatDTDAttlist(writer: xmlTextWriterPtr; name: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTDAttlist(writer: xmlTextWriterPtr; name, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 
 (*
@@ -185,8 +185,8 @@ function xmlTextWriterEndDTDEntity(writer: xmlTextWriterPtr): cint; EXTDECL; ext
 (*
  * DTD entity definition conveniency functions
  *)
-function xmlTextWriterWriteFormatDTDInternalEntity(writer: xmlTextWriterPtr; pe: cint; name: xmlCharPtr; format: pchar; args: array of const): cint; EXTDECL; external xml2lib;
-function xmlTextWriterWriteVFormatDTDInternalEntity(writer: xmlTextWriterPtr; pe: cint; name: xmlCharPtr; format: pchar; argptr: va_list): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteFormatDTDInternalEntity(writer: xmlTextWriterPtr; pe: cint; name: xmlCharPtr; format: PAnsiChar; args: array of const): cint; EXTDECL; external xml2lib;
+function xmlTextWriterWriteVFormatDTDInternalEntity(writer: xmlTextWriterPtr; pe: cint; name: xmlCharPtr; format: PAnsiChar; argptr: va_list): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTDInternalEntity(writer: xmlTextWriterPtr; pe: cint; name, content: xmlCharPtr): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTDExternalEntity(writer: xmlTextWriterPtr; pe: cint; name, pubid, sysid, ndataid: xmlCharPtr): cint; EXTDECL; external xml2lib;
 function xmlTextWriterWriteDTDExternalEntityContents(writer: xmlTextWriterPtr; pubid, sysid, ndataid: xmlCharPtr): cint; EXTDECL; external xml2lib;

packages/libxml/src/xmlxsd.pas

@@ -244,9 +244,9 @@ constructor XSDException.CreateNode(const Msg: String; name, nameSpace: xmlCharP
 var
   S: String;
 begin
-  S := PChar(name);
+  S := PAnsiChar(name);
   if Assigned(nameSpace) then
-    S := PChar(nameSpace)+':'+S;
+    S := PAnsiChar(nameSpace)+':'+S;
   inherited CreateFmt(Msg, [S]);
 end;
 
@@ -255,19 +255,19 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatBase64(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildCData(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: AnsiString): xmlNodePtr;
 begin
   Result := xmlNewNode(ns, name);
-  xmlAddChild(Result, xmlNewCDataBlock(parent^.doc, PChar(Value), Length(Value)));
+  xmlAddChild(Result, xmlNewCDataBlock(parent^.doc, PAnsiChar(Value), Length(Value)));
   xmlAddChild(parent, Result);
 end;
 
 function xsdNewChildString(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: AnsiString): xmlNodePtr;
 begin
-  Result := xmlNewChild(parent, ns, name, PChar(Value));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Value));
 end;
 
 function xsdNewChildBoolean(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Boolean; UseWords: Boolean): xmlNodePtr;
@@ -275,7 +275,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatBoolean(Value, UseWords);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildTime(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Hour, Minute, Second, Milliseconds: Longword; Timezone: PXsdTimezone): xmlNodePtr;
@@ -283,7 +283,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatTime(Hour, Minute, Second, Milliseconds, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildTime(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Time: TDateTime; Timezone: PXsdTimezone): xmlNodePtr;
@@ -291,7 +291,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatTime(Time, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDate(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Year, Month, Day: Longword; BC: Boolean; Timezone: PXsdTimezone): xmlNodePtr;
@@ -299,7 +299,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDate(Year, Month, Day, BC, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDate(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Date: TDateTime; Timezone: PXsdTimezone): xmlNodePtr;
@@ -307,7 +307,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDate(Date, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDateTime(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Year, Month, Day, Hour, Minute, Second, Milliseconds: Longword; BC: Boolean; Timezone: PXsdTimezone): xmlNodePtr;
@@ -315,7 +315,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDateTime(Year, Month, Day, Hour, Minute, Second, Milliseconds, BC, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDateTime(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; DateTime: TDateTime; Timezone: PXsdTimezone): xmlNodePtr;
@@ -323,7 +323,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDateTime(DateTime, Timezone);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDecimal(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Extended; Precision: Integer; Digits: Integer): xmlNodePtr;
@@ -331,7 +331,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDecimal(Value, Precision, Digits);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildDouble(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Double): xmlNodePtr;
@@ -339,7 +339,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDouble(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildFloat(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Single): xmlNodePtr;
@@ -347,7 +347,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatFloat(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildByte(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Shortint): xmlNodePtr;
@@ -355,7 +355,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatByte(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildShort(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Smallint): xmlNodePtr;
@@ -363,7 +363,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatShort(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildInt(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Longint): xmlNodePtr;
@@ -371,7 +371,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatInt(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildLong(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Int64): xmlNodePtr;
@@ -379,7 +379,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatLong(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildUnsignedByte(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Byte): xmlNodePtr;
@@ -387,7 +387,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedByte(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildUnsignedShort(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Word): xmlNodePtr;
@@ -395,7 +395,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedShort(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildUnsignedInt(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Longword): xmlNodePtr;
@@ -403,7 +403,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedInt(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildUnsignedLong(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: QWord): xmlNodePtr;
@@ -411,7 +411,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedLong(Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewChildEnum(parent: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; enum: array of AnsiString; Value: Integer): xmlNodePtr;
@@ -419,12 +419,12 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatEnum(enum, Value);
-  Result := xmlNewChild(parent, ns, name, PChar(Tmp));
+  Result := xmlNewChild(parent, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropString(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: AnsiString): xmlAttrPtr;
 begin
-  Result := xmlNewNsProp(node, ns, name, PChar(Value));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Value));
 end;
 
 function xsdNewPropBoolean(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Boolean; UseWords: Boolean): xmlAttrPtr;
@@ -432,7 +432,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatBoolean(Value, UseWords);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropTime(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Hour, Minute, Second, Milliseconds: Longword; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -440,7 +440,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatTime(Hour, Minute, Second, Milliseconds, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropTime(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Time: TDateTime; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -448,7 +448,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatTime(Time, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDate(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Year, Month, Day: Longword; BC: Boolean; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -456,7 +456,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDate(Year, Month, Day, BC, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDate(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Date: TDateTime; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -464,7 +464,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDate(Date, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDateTime(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Year, Month, Day, Hour, Minute, Second, Milliseconds: Longword; BC: Boolean; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -472,7 +472,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDateTime(Year, Month, Day, Hour, Minute, Second, Milliseconds, BC, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDateTime(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; DateTime: TDateTime; Timezone: PXsdTimezone): xmlAttrPtr;
@@ -480,7 +480,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDateTime(DateTime, Timezone);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDecimal(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Extended; Precision: Integer; Digits: Integer): xmlAttrPtr;
@@ -488,7 +488,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDecimal(Value, Precision, Digits);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropDouble(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Double): xmlAttrPtr;
@@ -496,7 +496,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatDouble(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropFloat(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Single): xmlAttrPtr;
@@ -504,7 +504,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatFloat(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropByte(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Shortint): xmlAttrPtr;
@@ -512,7 +512,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatByte(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropShort(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Smallint): xmlAttrPtr;
@@ -520,7 +520,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatShort(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropInt(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Longint): xmlAttrPtr;
@@ -528,7 +528,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatInt(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropLong(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Int64): xmlAttrPtr;
@@ -536,7 +536,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatLong(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropUnsignedByte(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Byte): xmlAttrPtr;
@@ -544,7 +544,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedByte(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropUnsignedShort(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Word): xmlAttrPtr;
@@ -552,7 +552,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedShort(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropUnsignedInt(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: Longword): xmlAttrPtr;
@@ -560,7 +560,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedInt(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropUnsignedLong(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; Value: QWord): xmlAttrPtr;
@@ -568,7 +568,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatUnsignedLong(Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdNewPropEnum(node: xmlNodePtr; ns: xmlNsPtr; name: xmlCharPtr; enum: array of AnsiString; Value: Integer): xmlAttrPtr;
@@ -576,7 +576,7 @@ var
   Tmp: AnsiString;
 begin
   Tmp := xsdFormatEnum(enum, Value);
-  Result := xmlNewNsProp(node, ns, name, PChar(Tmp));
+  Result := xmlNewNsProp(node, ns, name, PAnsiChar(Tmp));
 end;
 
 function xsdTestNodeNs(node: xmlNodePtr; nameSpace: xmlCharPtr): Boolean;

packages/libxml/src/xpath.inc

@@ -337,7 +337,7 @@
  * an xmlXPathContext, and the stack of objects.
  *)
   xmlXPathParserContext = record
-    cur           : xmlCharPtr;			(* the current char being parsed *)
+    cur           : xmlCharPtr;			(* the current AnsiChar being parsed *)
     base          : xmlCharPtr;			(* the full expression *)
 
     error         : cint;				(* error code *)

packages/libxml/src/xpathInternals.inc

@@ -332,7 +332,7 @@ procedure xmlXPathRegisterFuncLookup(ctxt: xmlXPathContextPtr; f: xmlXPathFuncLo
 (*
  * Error reporting.
  *)
-//procedure __xmlXPatherror(ctxt: xmlXPathParserContextPtr; _file: pchar; line, no: cint); EXTDECL; external xml2lib name 'xmlXPatherror';
+//procedure __xmlXPatherror(ctxt: xmlXPathParserContextPtr; _file: PAnsiChar; line, no: cint); EXTDECL; external xml2lib name 'xmlXPatherror';
 procedure xmlXPathErr(ctxt: xmlXPathParserContextPtr; error: cint); EXTDECL; external xml2lib;
 
 {$IFDEF LIBXML_DEBUG_ENABLED}
@@ -386,9 +386,9 @@ function valuePop(ctxt: xmlXPathParserContextPtr): xmlXPathObjectPtr; EXTDECL; e
 function valuePush(ctxt: xmlXPathParserContextPtr): cint; EXTDECL; external xml2lib;
 
 function xmlXPathNewString(val: xmlCharPtr): xmlXPathObjectPtr; EXTDECL; external xml2lib;
-function xmlXPathNewCString(val: pchar): xmlXPathObjectPtr; EXTDECL; external xml2lib;
+function xmlXPathNewCString(val: PAnsiChar): xmlXPathObjectPtr; EXTDECL; external xml2lib;
 function xmlXPathWrapString(val: xmlCharPtr): xmlXPathObjectPtr; EXTDECL; external xml2lib;
-function xmlXPathWrapCString(val: pchar): xmlXPathObjectPtr; EXTDECL; external xml2lib;
+function xmlXPathWrapCString(val: PAnsiChar): xmlXPathObjectPtr; EXTDECL; external xml2lib;
 function xmlXPathNewFloat(val: cdouble): xmlXPathObjectPtr; EXTDECL; external xml2lib;
 function xmlXPathNewBoolean(val: cint): xmlXPathObjectPtr; EXTDECL; external xml2lib;
 function xmlXPathNewNodeSet(val: xmlNodePtr): xmlXPathObjectPtr; EXTDECL; external xml2lib;