Browse Source

* Fix compilation using namespaces & unicode rtl

Michaël Van Canneyt 1 year ago
parent
commit
55d33aa6a7

+ 1 - 1
packages/fcl-pdf/src/fpttf.pp

@@ -865,7 +865,7 @@ begin
   // configure the search pattern,
   // configure the search pattern,
   // assume "name" is a std::string with the desired font name in it
   // assume "name" is a std::string with the desired font name in it
   res:=family+':style='+style;
   res:=family+':style='+style;
-  pat := FcNameParse(PChar(res));
+  pat := FcNameParse(PAnsiChar(res));
   FcConfigSubstitute(config, pat, FcMatchPattern);
   FcConfigSubstitute(config, pat, FcMatchPattern);
   FcDefaultSubstitute(pat);
   FcDefaultSubstitute(pat);
 
 

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

@@ -49,6 +49,7 @@ src/base/custcgi.pp=namespaced/FpWeb.HostApp.Custom.Cgi.pp
 src/base/websession.pp=namespaced/FpWeb.Session.pp
 src/base/websession.pp=namespaced/FpWeb.Session.pp
 src/base/fphttp.pp=namespaced/FpWeb.Http.Base.pp
 src/base/fphttp.pp=namespaced/FpWeb.Http.Base.pp
 src/base/webpage.pp=namespaced/FpWeb.WebPage.pp
 src/base/webpage.pp=namespaced/FpWeb.WebPage.pp
+src/base/fpdebugcapturesvc.pp=namespaced/FpWeb.Http.DebugCapture.pp
 src/webdata/sqldbwebdata.pp=namespaced/FpWeb.Data.SqlDb.pp
 src/webdata/sqldbwebdata.pp=namespaced/FpWeb.Data.SqlDb.pp
 {s*:src/webdata/}=namespaced/
 {s*:src/webdata/}=namespaced/
 {i+:src/webdata/}
 {i+:src/webdata/}

+ 7 - 2
packages/fcl-web/src/base/fpdebugcapturesvc.pp

@@ -12,15 +12,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpdebugcapturesvc;
 unit fpdebugcapturesvc;
+{$ENDIF}
 
 
 {$mode ObjFPC}{$H+}
 {$mode ObjFPC}{$H+}
 
 
 interface
 interface
 
 
 uses
 uses
-  CustApp, Classes, SysUtils, httpdefs, fphttp, fpjson;
-
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, FpWeb.Http.Defs, FpWeb.Http.Base, FpJson.Data; 
+{$ELSE}
+  Classes, SysUtils, httpdefs, fphttp, fpjson;
+{$ENDIF}
 Type
 Type
   TDebugCaptureHandler = Procedure (aSender : TObject; aCapture : TJSONData) of object;
   TDebugCaptureHandler = Procedure (aSender : TObject; aCapture : TJSONData) of object;
   TDebugCaptureLogHandler = Procedure (EventType : TEventType; const Msg : String) of object;
   TDebugCaptureLogHandler = Procedure (EventType : TEventType; const Msg : String) of object;