Browse Source

* use ufvcommon in unit uvalidate

git-svn-id: branches/unicodekvm@48595 -
nickysn 4 years ago
parent
commit
1ffb6c6fdf
2 changed files with 8 additions and 2 deletions
  1. 1 1
      packages/fv/fpmake.pp
  2. 7 1
      packages/fv/src/validate.inc

+ 1 - 1
packages/fv/fpmake.pp

@@ -352,7 +352,7 @@ begin
         begin
         begin
           AddInclude('validate.inc');
           AddInclude('validate.inc');
           AddInclude('platform.inc');
           AddInclude('platform.inc');
-          AddUnit('fvcommon');
+          AddUnit('ufvcommon');
           AddUnit('fvconsts');
           AddUnit('fvconsts');
           AddUnit('umsgbox');
           AddUnit('umsgbox');
         end;
         end;

+ 7 - 1
packages/fv/src/validate.inc

@@ -77,7 +77,13 @@ UNIT Validate;
 {$V-} { Turn off strict VAR strings }
 {$V-} { Turn off strict VAR strings }
 {====================================================================}
 {====================================================================}
 
 
-USES FVCommon, Objects, fvconsts;                      { GFV standard units }
+USES
+{$ifdef FV_UNICODE}
+  UFVCommon,
+{$else FV_UNICODE}
+  FVCommon,
+{$endif FV_UNICODE}
+  Objects, fvconsts;                      { GFV standard units }
 
 
 {***************************************************************************}
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
 {                              PUBLIC CONSTANTS                             }