Merged revisions 7451,7602 via svnmerge from

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

........
r7451 | Almindor | 2007-05-24 13:15:39 +0200 (Thu, 24 May 2007) | 2 lines

* remove forgotten writeln in base64 (* please merge me! *)

........
r7602 | marco | 2007-06-09 15:12:16 +0200 (Sat, 09 Jun 2007) | 1 line

 * fix for bug #9022 (merge)
........

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

packages/fcl-base/src/inc/base64.pp

@@ -239,7 +239,7 @@ begin
             Break;
         end;
       until count = 0;
-      writeln(Result);
+      // writeln(Result);
       // we are now either at the end of the stream, or encountered our first '=', stored in c
       if c = '=' then begin // '=' found
         if Result mod 4 <= 1 then // badly placed '=', disregard last block

packages/fcl-base/src/inc/streamio.pp

@@ -126,6 +126,11 @@ begin
     begin
     OpenFunc:=@StreamOpen;
     CloseFunc:=@StreamClose;
+ Case DefaultTextLineBreakStyle Of
+    tlbsLF: TextRec(f).LineEnd := #10;
+    tlbsCRLF: TextRec(f).LineEnd := #13#10;
+    tlbsCR: TextRec(f).LineEnd := #13;
+  End;
     PStream(@UserData)^:=Stream;
     Mode:=fmClosed;
     BufSize:=SizeOf(Buffer);