ソースを参照

* fixed for solaris:
* iconv is in libc for solaris
* use official names for unicode encodings (UTF-16BE/UTF-16LE instead
of unofficial UNICODEBIG/UNICODELITTLE aliases, which are not supported
by solaris' iconv)

git-svn-id: trunk@7452 -

Jonas Maebe 18 年 前
コミット
7e3b792713
1 ファイル変更3 行追加3 行削除
  1. 3 3
      rtl/unix/cwstring.pp

+ 3 - 3
rtl/unix/cwstring.pp

@@ -25,7 +25,7 @@ implementation
 
 {$linklib c}
 
-{$ifndef linux}  // Linux (and maybe glibc platforms in general), have iconv in glibc.
+{$if not defined(linux) and not defined(solaris)}  // Linux (and maybe glibc platforms in general), have iconv in glibc.
  {$linklib iconv}
  {$define useiconv}
 {$endif linux}
@@ -87,9 +87,9 @@ const
 
 { unicode encoding name }
 {$ifdef FPC_LITTLE_ENDIAN}
-  unicode_encoding = 'UNICODELITTLE';
+  unicode_encoding = 'UTF-16LE';
 {$else  FPC_LITTLE_ENDIAN}
-  unicode_encoding = 'UNICODEBIG';
+  unicode_encoding = 'UTF-16BE';
 {$endif  FPC_LITTLE_ENDIAN}
 
 type