Browse Source

* refactored slightly the BEOS ifdef in unixkvmbase.utf8enabled

git-svn-id: branches/unicodekvm@42320 -
nickysn 6 years ago
parent
commit
c964eab85d
1 changed files with 7 additions and 4 deletions
  1. 7 4
      packages/rtl-console/src/unix/unixkvmbase.pp

+ 7 - 4
packages/rtl-console/src/unix/unixkvmbase.pp

@@ -29,16 +29,19 @@ function UTF8Enabled: Boolean;
 uses
 uses
   baseunix;
   baseunix;
 
 
+{$ifdef BEOS}
+function UTF8Enabled: Boolean;
+begin
+  UTF8Enabled := true;
+end;
+{$else}
 function UTF8Enabled: Boolean;
 function UTF8Enabled: Boolean;
 var
 var
   lang:string;
   lang:string;
 begin
 begin
-  {$ifdef BEOS}
-  UTF8Enabled := true;
-  exit;
-  {$endif}
   lang:=upcase(fpgetenv('LANG'));
   lang:=upcase(fpgetenv('LANG'));
   UTF8Enabled := (Pos('.UTF-8', lang) > 0) or (Pos('.UTF8', lang) > 0);
   UTF8Enabled := (Pos('.UTF-8', lang) > 0) or (Pos('.UTF8', lang) > 0);
 end;
 end;
+{$endif}
 
 
 end.
 end.