From af538ebde87497746fc462874f77cf38cec83d7a Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 4 Sep 2006 13:08:20 +0000 Subject: [PATCH] * fixed merging of identical ansi/widestrings git-svn-id: trunk@4552 - --- compiler/ncgcon.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ncgcon.pas b/compiler/ncgcon.pas index aea26428a1..eac71820a8 100644 --- a/compiler/ncgcon.pas +++ b/compiler/ncgcon.pas @@ -338,11 +338,11 @@ implementation if assigned(hp2) and (hp2.typ=ait_const) and (tai_const(hp2).consttype=aitconst_aint) and - (tai_const(hp2).value=-1) and + (tai_const(hp2).value=len) and assigned(hp2.previous) and (tai(hp2.previous).typ=ait_const) and (tai_const(hp2.previous).consttype=aitconst_aint) and - (tai_const(hp2.previous).value=len) and + (tai_const(hp2.previous).value=-1) and assigned(hp2.previous.previous) and (tai(hp2.previous.previous).typ=ait_const) and (tai_const(hp2.previous.previous).consttype=aitconst_ptr) and