Browse Source

+ Patches from peter to fix 1.1 compile

michael 22 years ago
parent
commit
1f74cacb79
2 changed files with 16 additions and 6 deletions
  1. 8 1
      fcl/xml/sax.pp
  2. 8 5
      fcl/xml/sax_html.pp

+ 8 - 1
fcl/xml/sax.pp

@@ -627,7 +627,11 @@ end;
 
 
 procedure TSAXAttributes.BadIndex(Index: Integer);
 procedure TSAXAttributes.BadIndex(Index: Integer);
 begin
 begin
+{$ifdef VER1_0}
   raise ESAXAttributeIndexError.Create(Index) at get_caller_addr(get_frame);
   raise ESAXAttributeIndexError.Create(Index) at get_caller_addr(get_frame);
+{$else VER1_0}
+  raise ESAXAttributeIndexError.Create(Index) at pointer(get_caller_addr(get_frame));
+{$endif VER1_0}
 end;
 end;
 
 
 
 
@@ -930,7 +934,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.1  2002-12-11 21:06:07  sg
+  Revision 1.2  2002-12-12 13:43:38  michael
+  + Patches from peter to fix 1.1 compile
+
+  Revision 1.1  2002/12/11 21:06:07  sg
   * Small cleanups
   * Small cleanups
   * Replaced htmldoc unit with dom_html unit
   * Replaced htmldoc unit with dom_html unit
   * Added SAX parser framework and SAX HTML parser
   * Added SAX parser framework and SAX HTML parser

+ 8 - 5
fcl/xml/sax_html.pp

@@ -337,15 +337,15 @@ var
 begin
 begin
   case ScannerContext of
   case ScannerContext of
     scWhitespace:
     scWhitespace:
-      DoIgnorableWhitespace(PChar(TokenText), 1, Length(TokenText));
+      DoIgnorableWhitespace(PSAXChar(TokenText), 1, Length(TokenText));
     scText:
     scText:
-      DoCharacters(PChar(TokenText), 0, Length(TokenText));
+      DoCharacters(PSAXChar(TokenText), 0, Length(TokenText));
     scEntityReference:
     scEntityReference:
       begin
       begin
         if ResolveHTMLEntityReference(TokenText, Ent) then
         if ResolveHTMLEntityReference(TokenText, Ent) then
 	begin
 	begin
 	  EntString := Ent;
 	  EntString := Ent;
-	  DoCharacters(PChar(EntString), 0, 1);
+	  DoCharacters(PSAXChar(EntString), 0, 1);
 	end else
 	end else
 	begin
 	begin
 	  { Is this a predefined Unicode character entity? We must check this,
 	  { Is this a predefined Unicode character entity? We must check this,
@@ -361,7 +361,7 @@ begin
 	  if Found then
 	  if Found then
 	    DoSkippedEntity(TokenText)
 	    DoSkippedEntity(TokenText)
 	  else
 	  else
-            DoCharacters(PChar('&' + TokenText), 0, Length(TokenText) + 1);
+            DoCharacters(PSAXChar('&' + TokenText), 0, Length(TokenText) + 1);
 	end;
 	end;
       end;
       end;
     scTag:
     scTag:
@@ -547,7 +547,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.1  2002-12-11 21:06:07  sg
+  Revision 1.2  2002-12-12 13:43:38  michael
+  + Patches from peter to fix 1.1 compile
+
+  Revision 1.1  2002/12/11 21:06:07  sg
   * Small cleanups
   * Small cleanups
   * Replaced htmldoc unit with dom_html unit
   * Replaced htmldoc unit with dom_html unit
   * Added SAX parser framework and SAX HTML parser
   * Added SAX parser framework and SAX HTML parser