paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-31 22:10:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for tf_winlikewidestring in the target's flags instead of relying on the target being a Windows system when determining whether the system as the WideString type that's separate from UnicodeString

Browse Source 
git-svn-id: trunk@33900 -
This commit is contained in:
svenbarth 2016-06-04 08:45:22 +00:00
parent 293d9be6b6
commit 17bb29ddc3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/ninl.pas
View File

@ -4296,7 +4296,7 @@ implementation
write_system_parameter_lists('fpc_shortstr_insert');
write_system_parameter_lists('fpc_shortstr_insert_char');
write_system_parameter_lists('fpc_unicodestr_insert');
if target_info.system in systems_windows then
if tf_winlikewidestring in target_info.flags then
write_system_parameter_lists('fpc_widestr_insert');
write_system_parameter_lists('fpc_ansistr_insert');
exit(cerrornode.create);
@ -4328,7 +4328,7 @@ implementation
CGMessagePos1(fileinfo,parser_e_wrong_parameter_size,'Delete');
write_system_parameter_lists('fpc_shortstr_delete');
write_system_parameter_lists('fpc_unicodestr_delete');
if target_info.system in systems_windows then
if tf_winlikewidestring in target_info.flags then
write_system_parameter_lists('fpc_widestr_delete');
write_system_parameter_lists('fpc_ansistr_delete');
exit(cerrornode.create);

2
compiler/options.pas
View File

@ -4071,7 +4071,7 @@ begin
set_system_macro('FPC_PATCH',patch_nr);
set_system_macro('FPC_FULLVERSION',Format('%d%.02d%.02d',[StrToInt(version_nr),StrToInt(release_nr),StrToInt(patch_nr)]));
if not(target_info.system in systems_windows) then
if not (tf_winlikewidestring in target_info.flags) then
def_system_macro('FPC_WIDESTRING_EQUAL_UNICODESTRING');
for i:=low(tfeature) to high(tfeature) do