Merged revisions 8494 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r8494 | jonas | 2007-09-15 23:15:06 +0200 (Sat, 15 Sep 2007) | 2 lines

  * fixed mantis #9695 introduced by the fix in r7959

........

git-svn-id: branches/fixes_2_2@8496 -

.gitattributes

@@ -8314,6 +8314,7 @@ tests/webtbs/tw9309.pp -text
 tests/webtbs/tw9347.pp svneol=native#text/plain
 tests/webtbs/tw9347a.pp svneol=native#text/plain
 tests/webtbs/tw9347b.pp svneol=native#text/plain
+tests/webtbs/tw9695.pp svneol=native#text/plain
 tests/webtbs/ub1873.pp svneol=native#text/plain
 tests/webtbs/ub1883.pp svneol=native#text/plain
 tests/webtbs/uw0555.pp svneol=native#text/plain

rtl/inc/real2str.inc

@@ -383,7 +383,7 @@ begin
           if int(d+roundCorr) = 1 then
             begin
               roundStr(temp,spos);
-              d := frac(d);
+              d := frac(d+roundCorr);
               if (f < 0) then
                 dec(currprec);
             end;

tests/webtbs/tw9695.pp

@@ -0,0 +1,9 @@
+var
+  s: string;
+  d: Double;
+begin
+  d := 5.9999999999999991;
+  Str(d:23,s); 
+  if (pos('9',s)<>0) or (pos('5',s)<>0) then
+    halt(1);
+end.