浏览代码

- partially reverted r36451 (effectively disabling code page aware messages
under unix-likes), because it turned out that pulling in unit fpwidestring
into the compiler sources causes testsuite regressions under linux. This
needs to be resolved somehow.

git-svn-id: trunk@36452 -

nickysn 8 年之前
父节点
当前提交
684d9ebb2e
共有 1 个文件被更改,包括 12 次插入1 次删除
  1. 12 1
      compiler/compiler.pas

+ 12 - 1
compiler/compiler.pas

@@ -39,7 +39,18 @@ uses
 {$if defined(unix) and (FPC_FULLVERSION>20700)}
   { system code page stuff for unix }
   unixcp,
-  fpwidestring,
+  { we also need unit fpwidestring for the codepage-aware messages support, but
+    unfortunately, pulling this unit in, causes regressions in the following
+    tests:
+
+    test/packages/bzip2/tbzip2streamtest
+    test/units/system/tres
+    test/units/system/tres2
+    test/units/system/tres3
+    test/units/system/tres4
+
+    this needs to be resolved first, before this unit is included. }
+//  fpwidestring,
 {$endif}
 {$IFNDEF USE_FAKE_SYSUTILS}
   sysutils,math,