Procházet zdrojové kódy

* fixed bug in libxml2
* added AnsiString version of BAD_CAST macro

git-svn-id: trunk@11742 -

ivost před 17 roky
rodič
revize
84fb9f1025

+ 5 - 0
packages/libxml/src/libxml2.pas

@@ -286,6 +286,11 @@ begin
   result := xmlCharPtr(str);
 end;
 
+function BAD_CAST(str: string): xmlCharPtr;
+begin
+  result := xmlCharPtr(PChar(str));
+end;
+
 
 (*
  * macros from chvalid.inc

+ 1 - 1
packages/libxml/src/valid.inc

@@ -201,7 +201,7 @@ function xmlValidateOneNamespace(ctxt: xmlValidCtxtPtr; doc: xmlDocPtr; elem: xm
 function xmlValidateDocumentFinal(ctxt: xmlValidCtxtPtr; doc: xmlDocPtr): cint; XMLCALL; XMLPUBFUN;
 {$ENDIF} (* LIBXML_VALID_ENABLED *)
 
-{$IF defined(LIBXML_VALID_ENABLED) ordefined(LIBXML_SCHEMAS_ENABLED)}
+{$IF defined(LIBXML_VALID_ENABLED) or defined(LIBXML_SCHEMAS_ENABLED)}
 function xmlValidateNotationUse(ctxt: xmlValidCtxtPtr; doc: xmlDocPtr; notationName: xmlCharPtr): cint; XMLCALL; XMLPUBFUN;
 {$ENDIF} (* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED *)
 

+ 2 - 1
packages/libxml/src/xmlstring.inc

@@ -31,6 +31,7 @@
  * Macro to cast a string to an xmlChar * when one know its safe.
  *)
 function BAD_CAST(str: pchar): xmlCharPtr; inline;
+function BAD_CAST(str: string): xmlCharPtr; inline;
 
 (*
  * xmlChar handling
@@ -65,4 +66,4 @@ function xmlUTF8Strsub(str: xmlCharPtr; start: cint; len: cint): xmlCharPtr; XML
 function xmlUTF8Strlen(utf: xmlCharPtr): cint; XMLCALL; XMLPUBFUN;
 function xmlUTF8Size(utf: xmlCharPtr): cint; XMLCALL; XMLPUBFUN;
 function xmlUTF8Charcmp(utf1: xmlCharPtr; utf2: xmlCharPtr): cint; XMLCALL; XMLPUBFUN;
-{$ENDIF}
+{$ENDIF}