next bugs in fpc version:

-more visible "LANG"*_CHARSET (we use it in mORMoti18n) -bug in comment in mORMoti18n (is it fpc bug ?)
mariuszmaximus · Jun 14, 2015 · 1fd44e1 · 1fd44e1
1 parent 488baf9
commit 1fd44e1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 29 deletions.
diff --git a/SQLite3/mORMoti18n.pas b/SQLite3/mORMoti18n.pas
@@ -61,7 +61,7 @@
      (if the ENHANCEDRTL conditional is not defined - see above)
    - CR/LF consistent replacement (#13->'|', #10->'~')
 
-   uses ini-compatible plain text messages language file format (*.msg):
+   uses ini-compatible plain text messages language file format ( *.msg):
    - Ansi, UTF8 or Unicode .msg files are translated into appropriate CharSet
    - messages translations before first [FormName] section of .msg file
       used for resourcestring and _()

diff --git a/SynCommons.pas b/SynCommons.pas
@@ -12638,6 +12638,32 @@ function SynLZCompressToBytes(P: PAnsiChar; PLen: integer;
 /// uncompress a memory bufer using the SynLZ algorithm and crc32c hashing
 function SynLZDecompress(const Data: TByteDynArray): RawByteString; overload;
 
+{$ifdef LINUX}
+const
+  ANSI_CHARSET = 0;
+  DEFAULT_CHARSET = 1;
+  SYMBOL_CHARSET = 2;
+  SHIFTJIS_CHARSET = $80;
+  HANGEUL_CHARSET = 129;
+  GB2312_CHARSET = 134;
+  CHINESEBIG5_CHARSET = 136;
+  OEM_CHARSET = 255;
+  JOHAB_CHARSET = 130;
+  HEBREW_CHARSET = 177;
+  ARABIC_CHARSET = 178;
+  GREEK_CHARSET = 161;
+  TURKISH_CHARSET = 162;
+  VIETNAMESE_CHARSET = 163;
+  THAI_CHARSET = 222;
+  EASTEUROPE_CHARSET = 238;
+  RUSSIAN_CHARSET = 204;
+  BALTIC_CHARSET = 186;
+{$else}
+{$ifdef FPC}
+const
+  VIETNAMESE_CHARSET = 163;
+{$endif}
+{$endif}
 
 resourcestring
   sInvalidIPAddress = '"%s" is an invalid IP v4 address';
@@ -12698,7 +12724,6 @@ implementation
   UTF8_EXTRA_SURROGATE = 3;
   UTF8_FIRSTBYTE: array[2..6] of byte = ($c0,$e0,$f0,$f8,$fc);
 
-
 { TSynAnsiConvert }
 
 const
@@ -25771,33 +25796,6 @@ function GetCaptionFromEnum(aTypeInfo: pointer; aIndex: integer): string;
   GetCaptionFromPCharLen(tmp,result);
 end;
 
-{$ifdef LINUX}
-const
-  ANSI_CHARSET = 0;
-  DEFAULT_CHARSET = 1;
-  SYMBOL_CHARSET = 2;
-  SHIFTJIS_CHARSET = $80;
-  HANGEUL_CHARSET = 129;
-  GB2312_CHARSET = 134;
-  CHINESEBIG5_CHARSET = 136;
-  OEM_CHARSET = 255;
-  JOHAB_CHARSET = 130;
-  HEBREW_CHARSET = 177;
-  ARABIC_CHARSET = 178;
-  GREEK_CHARSET = 161;
-  TURKISH_CHARSET = 162;
-  VIETNAMESE_CHARSET = 163;
-  THAI_CHARSET = 222;
-  EASTEUROPE_CHARSET = 238;
-  RUSSIAN_CHARSET = 204;
-  BALTIC_CHARSET = 186;
-{$else}
-{$ifdef FPC}
-const
-  VIETNAMESE_CHARSET = 163;
-{$endif}
-{$endif}
-
 function CharSetToCodePage(CharSet: integer): cardinal;
 begin
   case CharSet of