diff options
| author | paul <paul@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-09-17 15:36:56 +0000 |
|---|---|---|
| committer | paul <paul@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-09-17 15:36:56 +0000 |
| commit | 01a4f318988ba62756f3f8bf0be7beb755f7d52e (patch) | |
| tree | d275ab569ee858dc2152c379c8fdda8087e2b4f6 /compiler/ncgcon.pas | |
| parent | b6ea9446e469aeddb48309780316654511d4e894 (diff) | |
| download | fpc-01a4f318988ba62756f3f8bf0be7beb755f7d52e.tar.gz | |
compiler: manual merge some cpstrnew changes which was impossible to merge using regular tools due to the merge conflicts
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@19131 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/ncgcon.pas')
| -rw-r--r-- | compiler/ncgcon.pas | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/ncgcon.pas b/compiler/ncgcon.pas index 69b3ae4135..3f26dc838e 100644 --- a/compiler/ncgcon.pas +++ b/compiler/ncgcon.pas @@ -304,7 +304,7 @@ implementation if len=0 then InternalError(2008032301) { empty string should be handled above } else - lastlabel:=emit_ansistring_const(current_asmdata.AsmLists[al_typedconsts],value_str,len); + lastlabel:=emit_ansistring_const(current_asmdata.AsmLists[al_typedconsts],value_str,len,tstringdef(resultdef).encoding); end; cst_unicodestring, cst_widestring: @@ -314,6 +314,7 @@ implementation else lastlabel := emit_unicodestring_const(current_asmdata.AsmLists[al_typedconsts], value_str, + tstringdef(resultdef).encoding, (cst_type=cst_widestring) and (tf_winlikewidestring in target_info.flags)); end; cst_shortstring: |