paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 13:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixed XML compilation

Browse Source 
git-svn-id: trunk@4993 -
This commit is contained in:
michael 2006-10-21 13:13:02 +00:00
parent 27e08edd76
commit 55563d5a92
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fcl/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/13] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@ -2822,7 +2822,7 @@ ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1r FPCCPUOPT:=-O1r
endif endif
else else
FPCCPUOPT:=-O2 FPCCPUOPT:=-O1r
endif endif
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE

6
fcl/Makefile.fpc
View File

@ -27,9 +27,9 @@ units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszl
[target] [target]
dirs=xml image db shedit passrc net fpcunit web dirs=xml image db shedit passrc net fpcunit web
units=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \ units=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \
iostream zstream cachecls avl_tree htmldefs xmlreg registry eventlog custapp \ iostream zstream cachecls avl_tree htmldefs xmlreg registry \
cgiapp wformat whtml wtex rttiutils bufstream streamex blowfish zipper streamio \ eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream \
inicol pooledmm streamex blowfish zipper streamio inicol pooledmm
units_freebsd=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf units_freebsd=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf
units_darwin=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf units_darwin=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf
units_solaris=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf units_solaris=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf

8
fcl/xml/htmwrite.pp
View File

@ -178,8 +178,8 @@ end;
procedure WriteElement(node: TDOMNode); procedure WriteElement(node: TDOMNode);
var var
h : THTMLElementTag;
i: Integer; i: Integer;
J : THTMLElementTag;
attr, child: TDOMNode; attr, child: TDOMNode;
s: String; s: String;
SavedInsideTextNode: Boolean; SavedInsideTextNode: Boolean;
@ -187,10 +187,10 @@ var
begin begin
s := LowerCase(node.NodeName); s := LowerCase(node.NodeName);
ElFlags := [efSubelementContent, efPCDATAContent]; // default flags ElFlags := [efSubelementContent, efPCDATAContent]; // default flags
for h := Low(HTMLElementProps) to High(HTMLElementProps) do for j := Low(THTMLElementTag) to High(THTMLElementTag) do
if HTMLElementProps[h].Name = s then if HTMLElementProps[J].Name = s then
begin begin
ElFlags := HTMLElementProps[h].Flags; ElFlags := HTMLElementProps[j].Flags;
break; break;
end; end;

3
fcl/xml/sax_html.pp
View File

@ -531,6 +531,7 @@ var
i : Integer; i : Integer;
j : THTMLElementTag; j : THTMLElementTag;
TagInfo: PHTMLElementProps; TagInfo: PHTMLElementProps;
begin begin
// WriteLn('End: ', LocalName, '. Node buffer: ', FNodeBuffer.Count, ' elements'); // WriteLn('End: ', LocalName, '. Node buffer: ', FNodeBuffer.Count, ' elements');
// Find the matching start tag // Find the matching start tag
@ -544,7 +545,7 @@ begin
// We found the matching start tag // We found the matching start tag
TagInfo := nil; TagInfo := nil;
for j := Low(HTMLElementProps) to High(HTMLElementProps) do for j := Low(THTMLElementTag) to High(THTMLElementTag) do
if CompareText(HTMLElementProps[j].Name, LocalName) = 0 then if CompareText(HTMLElementProps[j].Name, LocalName) = 0 then
begin begin
TagInfo := @HTMLElementProps[j]; TagInfo := @HTMLElementProps[j];