|
@@ -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
|