浏览代码

* Some fixes for namespaced compilation

Michaël Van Canneyt 1 年之前
父节点
当前提交
b003828d26

+ 2 - 2
packages/fcl-image/namespaced/FpImage.ColorSpace.pp

@@ -1,3 +1,3 @@
-{$DEFINE FPC_DOTTEDUNITS}
 unit FpImage.ColorSpace;
 unit FpImage.ColorSpace;
-{$i fpcolorspace.pas}
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcolorspace.pas}

+ 4 - 0
packages/fcl-image/src/fpreadjpeg.pas

@@ -109,7 +109,11 @@ type
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.ColorSpace;
+{$ELSE}
 uses FPColorSpace;
 uses FPColorSpace;
+{$ENDIF}
 
 
 type
 type
   int_Color_Table = array[0..MAXJSAMPLE+1-1] of int;
   int_Color_Table = array[0..MAXJSAMPLE+1-1] of int;

+ 3 - 2
packages/fcl-pdf/src/fpttf.pp

@@ -173,8 +173,9 @@ uses
   ,WinApi.Activex
   ,WinApi.Activex
   {$endif}
   {$endif}
   {$if (defined(LINUX) or defined(BSD)) and not defined(DARWIN)}
   {$if (defined(LINUX) or defined(BSD)) and not defined(DARWIN)}
-  ,Api.Libfontconfig, UnixApi.Types
-  {$ifend}
+  , Api.Libfontconfig
+  , UnixApi.types
+  {$endif}
   ;
   ;
 {$ELSE FPC_DOTTEDUNITS}
 {$ELSE FPC_DOTTEDUNITS}
 uses
 uses