Browse Source

* Correct compilation with namespaces

Michaël Van Canneyt 11 months ago
parent
commit
ad34a8d574

+ 1 - 0
packages/fcl-css/namespaces.lst

@@ -2,6 +2,7 @@
 {i+:src/}
 {i+:src/}
 src/fpcssscanner.pp=namespaced/FpCss.Scanner.pp
 src/fpcssscanner.pp=namespaced/FpCss.Scanner.pp
 src/fpcssresolver.pas=namespaced/FpCss.Resolver.pas
 src/fpcssresolver.pas=namespaced/FpCss.Resolver.pas
+src/fpcssresparser.pas=namespaced/FpCss.ValueParser.pas
 src/fpcssutils.pp=namespaced/FpCss.Utils.pp
 src/fpcssutils.pp=namespaced/FpCss.Utils.pp
 src/fpcssparser.pp=namespaced/FpCss.Parser.pp
 src/fpcssparser.pp=namespaced/FpCss.Parser.pp
 src/fpcsstree.pp=namespaced/FpCss.Tree.pp
 src/fpcsstree.pp=namespaced/FpCss.Tree.pp

+ 1 - 1
packages/fcl-css/src/fpcssresolver.pas

@@ -113,7 +113,7 @@ interface
 {$IFDEF FPC_DOTTEDUNITS}
 {$IFDEF FPC_DOTTEDUNITS}
 uses
 uses
   System.Classes, System.SysUtils, System.Types, System.Contnrs, System.StrUtils,
   System.Classes, System.SysUtils, System.Types, System.Contnrs, System.StrUtils,
-  FPCSS.Tree, FPCSS.ValueParser;
+  Fcl.AVLTree, FpCss.Tree, FpCss.ValueParser;
 {$ELSE FPC_DOTTEDUNITS}
 {$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, types, Contnrs, AVL_Tree, StrUtils, fpCSSTree, fpCSSResParser;
   Classes, SysUtils, types, Contnrs, AVL_Tree, StrUtils, fpCSSTree, fpCSSResParser;

+ 2 - 2
packages/fcl-css/src/fpcssresparser.pas

@@ -29,8 +29,8 @@ interface
 
 
 {$IFDEF FPC_DOTTEDUNITS}
 {$IFDEF FPC_DOTTEDUNITS}
 uses
 uses
-  System.Classes, System.SysUtils, System.Types, System.Contnrs, System.StrUtils,
-  FPCSS.Tree, FPCSS.Scanner, FPCSS.Parser;
+  System.Classes, System.SysUtils, System.Math, System.Contnrs, System.StrUtils,
+  Fcl.AVLTree, FpCss.Tree, FpCss.Scanner, FpCss.Parser;
 {$ELSE FPC_DOTTEDUNITS}
 {$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, Math, Contnrs, AVL_Tree, fpCSSTree, fpCSSScanner,
   Classes, SysUtils, Math, Contnrs, AVL_Tree, fpCSSTree, fpCSSScanner,