paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 11:09:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* try a fallback to 'Universal' locale if the locale set in LANG is not recognized/supported by OS/2

Browse Source 
git-svn-id: trunk@29571 -
This commit is contained in:
Tomas Hajny 2015-01-28 00:30:38 +00:00
parent 56f53176e7
commit 919e58fc99
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/os2/sysucode.inc
View File

@ -150,6 +150,7 @@ const
Uni_System_Locales = 1; Uni_System_Locales = 1;
Uni_User_Locales = 2; Uni_User_Locales = 2;
WNull: WideChar = #0; WNull: WideChar = #0;
WUniv: array [0..4] of WideChar = 'UNIV'#0;
@ -748,10 +749,23 @@ begin
RCI := Sys_UniFreeLocaleObject (DefLocObj); RCI := Sys_UniFreeLocaleObject (DefLocObj);
if RCI <> 0 then if RCI <> 0 then
OSErrorWatch (cardinal (RCI)); OSErrorWatch (cardinal (RCI));
DefLocObj := nil;
end; end;
RCI := Sys_UniCreateLocaleObject (Uni_UCS_String_Pointer, @WNull, DefLocObj); RCI := Sys_UniCreateLocaleObject (Uni_UCS_String_Pointer, @WNull, DefLocObj);
if RCI <> 0 then if RCI <> 0 then
OSErrorWatch (cardinal (RCI)); begin
OSErrorWatch (cardinal (RCI));
(* The locale dependent routines like comparison require a valid locale *)
(* setting, but the locale set using environment variable LANG is not *)
(* recognized by OS/2 -> we try the "Universal" locale as a fallback. *)
RCI := Sys_UniCreateLocaleObject (Uni_UCS_String_Pointer, @WUniv [0],
DefLocObj);
if RCI <> 0 then
begin
OSErrorWatch (cardinal (RCI));
DefLocObj := nil;
end;
end;
if not (UniAPI) then if not (UniAPI) then
ReInitDummyAnsiSupport; ReInitDummyAnsiSupport;
InInitDefaultCP := -1; InInitDefaultCP := -1;