diff options
author | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-08-11 16:12:34 +0000 |
---|---|---|
committer | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-08-11 16:12:34 +0000 |
commit | 9590d4deaffe934ca848296409fc3ec4851a5036 (patch) | |
tree | 78d3d45c59a3e14424be9176c22853af924839c4 /packages/fcl-xml | |
parent | 31157e92f821911d779137f4ff646fe1f7f88461 (diff) | |
download | fpc-9590d4deaffe934ca848296409fc3ec4851a5036.tar.gz |
* disable packages which do not build on msdos
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@25236 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-xml')
-rw-r--r-- | packages/fcl-xml/fpmake.pp | 2 | ||||
-rw-r--r-- | packages/fcl-xml/src/dom.pp | 20 | ||||
-rw-r--r-- | packages/fcl-xml/src/xmlutils.pp | 14 |
3 files changed, 24 insertions, 12 deletions
diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp index 260b5be0a3..4c9130e50e 100644 --- a/packages/fcl-xml/fpmake.pp +++ b/packages/fcl-xml/fpmake.pp @@ -29,7 +29,7 @@ begin P.Email := ''; P.Description := 'XML and DOM parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded]; + P.OSes:=AllOSes-[embedded,msdos]; P.SourcePath.Add('src'); P.IncludePath.Add('src'); diff --git a/packages/fcl-xml/src/dom.pp b/packages/fcl-xml/src/dom.pp index d767c055ad..1ca86ffc11 100644 --- a/packages/fcl-xml/src/dom.pp +++ b/packages/fcl-xml/src/dom.pp @@ -3,7 +3,7 @@ Implementation of DOM interfaces Copyright (c) 1999-2000 by Sebastian Guenther, sg@freepascal.org - Modified in 2006 by Sergei Gorelkin, sergei_gorelkin@mail.ru + Modified in 2006 by Sergei Gorelkin, sergei_gorelkin@mail.ru See the file COPYING.FPC, included in this distribution, for details about the copyright. @@ -100,7 +100,11 @@ type TNodePool = class; PNodePoolArray = ^TNodePoolArray; +{$ifdef CPU16} + TNodePoolArray = array[0..MaxSmallInt div sizeof(Pointer)-1] of TNodePool; +{$else CPU16} TNodePoolArray = array[0..MaxInt div sizeof(Pointer)-1] of TNodePool; +{$endif CPU16} {$ifndef fpc} TFPList = TList; @@ -1164,7 +1168,7 @@ begin while Assigned(parent) and (parent.NodeType <> ELEMENT_NODE) do parent := parent.ParentNode; Result := TDOMElement(parent); - end; + end; end; // TODO: specs prescribe to return default namespace if APrefix=null, @@ -1201,7 +1205,7 @@ begin end; end end; - end; + end; result := GetAncestorElement(Self).LookupNamespaceURI(APrefix); end; @@ -1231,7 +1235,7 @@ begin begin result := (nsURI = namespaceURI); Exit; - end + end else if HasAttributes then begin Map := Attributes; @@ -1384,7 +1388,7 @@ begin if Assigned(RefChild) and (RefChild.ParentNode <> Self) then raise EDOMNotFound.Create('NodeWC.InsertBefore'); - // TODO: skip checking Fragments as well? (Fragment itself cannot be in the tree) + // TODO: skip checking Fragments as well? (Fragment itself cannot be in the tree) if not (NewChildType in [TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE]) and (NewChild.FirstChild <> nil) then begin Tmp := Self; @@ -1411,7 +1415,7 @@ begin raise EDOMHierarchyRequest.Create('NodeWC.InsertBefore'); Tmp := Tmp.NextSibling; end; - + while Assigned(TDOMDocumentFragment(NewChild).FFirstChild) do InsertBefore(TDOMDocumentFragment(NewChild).FFirstChild, RefChild); end; @@ -2132,7 +2136,7 @@ begin Result := -NAMESPACE_ERR; Exit; end; - // Name validity has already been checked by IsXmlName() call above. + // Name validity has already been checked by IsXmlName() call above. // So just check that colon isn't first or last char, and that it is follwed by NameStartChar. if ((Result = 1) or (Result = L) or not IsXmlName(@QName[Result+1], 1)) then begin @@ -3021,7 +3025,7 @@ begin if Assigned(FAttributes) then for I := 0 to FAttributes.Length - 1 do FAttributes[I].Normalize; - inherited Normalize; + inherited Normalize; end; function TDOMElement.GetAttributes: TDOMNamedNodeMap; diff --git a/packages/fcl-xml/src/xmlutils.pp b/packages/fcl-xml/src/xmlutils.pp index 939bf9df7a..ab68094dd3 100644 --- a/packages/fcl-xml/src/xmlutils.pp +++ b/packages/fcl-xml/src/xmlutils.pp @@ -80,7 +80,7 @@ type {$ifndef fpc} PtrInt = LongInt; TFPList = TList; -{$endif} +{$endif} PPHashItem = ^PHashItem; PHashItem = ^THashItem; @@ -90,7 +90,11 @@ type Next: PHashItem; Data: TObject; end; +{$ifdef CPU16} + THashItemArray = array[0..MaxSmallInt div sizeof(Pointer)-1] of PHashItem; +{$else CPU16} THashItemArray = array[0..MaxInt div sizeof(Pointer)-1] of PHashItem; +{$endif CPU16} PHashItemArray = ^THashItemArray; THashForEach = function(Entry: PHashItem; arg: Pointer): Boolean; @@ -127,7 +131,11 @@ type lname: PWideChar; lnameLen: Integer; end; +{$ifdef CPU16} + TExpHashEntryArray = array[0..MaxSmallInt div sizeof(TExpHashEntry)-1] of TExpHashEntry; +{$else CPU16} TExpHashEntryArray = array[0..MaxInt div sizeof(TExpHashEntry)-1] of TExpHashEntry; +{$endif CPU16} PExpHashEntryArray = ^TExpHashEntryArray; TDblHashArray = class(TObject) @@ -135,7 +143,7 @@ type FSizeLog: Integer; FRevision: LongWord; FData: PExpHashEntryArray; - public + public procedure Init(NumSlots: Integer); function Locate(uri: Pointer; localName: PWideChar; localLength: Integer): Boolean; destructor Destroy; override; @@ -533,7 +541,7 @@ begin if Assigned(e) then Result := e^.Data else - Result := nil; + Result := nil; end; function THashTable.Lookup(Key: PWideChar; KeyLength: Integer; |