Selaa lähdekoodia

+ sLineBreak and misc. stuff for Kylix compatiblity

florian 24 vuotta sitten
vanhempi
commit
1f91d1d88e
6 muutettua tiedostoa jossa 41 lisäystä ja 22 poistoa
  1. 7 1
      rtl/go32v2/system.pp
  2. 7 5
      rtl/inc/systemh.inc
  3. 5 10
      rtl/inc/text.inc
  4. 7 2
      rtl/os2/system.pas
  5. 4 0
      rtl/unix/sysunixh.inc
  6. 11 4
      rtl/win32/system.pp

+ 7 - 1
rtl/go32v2/system.pp

@@ -46,6 +46,9 @@ const
 
   FileNameCaseSensitive : boolean = false;
 
+  sLineBreak : string[2] = #13#10;
+  DefaultTextLineBreakStyle : TTextLineBreakStyle = tlbsCRLF;
+
 { Default memory segments (Tp7 compatibility) }
   seg0040 = $0040;
   segA000 = $A000;
@@ -1417,7 +1420,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.6  2001-03-21 21:08:20  hajny
+  Revision 1.7  2001-03-21 23:29:40  florian
+    + sLineBreak and misc. stuff for Kylix compatiblity
+
+  Revision 1.6  2001/03/21 21:08:20  hajny
     * GetDir fixed
 
   Revision 1.5  2001/03/16 20:09:58  hajny

+ 7 - 5
rtl/inc/systemh.inc

@@ -53,6 +53,7 @@ Type
   Word     = 0..65535;
   dword    = cardinal;
   longword = cardinal;
+  Integer  = smallint;
 
 { at least declare Turbo Pascal real types }
 {$ifdef i386}
@@ -111,6 +112,7 @@ Type
   PWord    = ^word;
   PDWord   = ^DWord;
   PLongint = ^Longint;
+  TTextLineBreakStyle = (tlbsLF,tlbsCRLF,tlbsCR);
 
 {$ifdef HASWIDECHAR}
   PWideChar   = ^WideChar;
@@ -128,9 +130,6 @@ const
   maxLongint  = $7fffffff;
   maxSmallint = 32767;
 
-{ Integer type definition }
-type
-  Integer  = smallint;
 const
   maxint   = maxsmallint;
 
@@ -176,7 +175,7 @@ var
   ExitCode    : Word;
   StackBottom,
   LowestStack,
-  RandSeed    : Cardinal;
+  RandSeed    : Cardinal;  
 { Delphi compatible }
   IsLibrary,IsMultiThreaded,IsConsole : boolean;
 {$ifdef MT}
@@ -488,7 +487,10 @@ const
 
 {
   $Log$
-  Revision 1.16  2001-01-24 21:47:18  florian
+  Revision 1.17  2001-03-21 23:29:40  florian
+    + sLineBreak and misc. stuff for Kylix compatiblity
+
+  Revision 1.16  2001/01/24 21:47:18  florian
     + more MT stuff added
 
   Revision 1.15  2000/12/16 15:56:19  jonas

+ 5 - 10
rtl/inc/text.inc

@@ -439,21 +439,13 @@ end;
 
 
 Procedure Writeln_End(var f:TextRec);[Public,Alias:'FPC_WRITELN_END'];
-const
-{$IFDEF SHORT_LINEBREAK}
-  eollen=1;
-  eol : array[0..0] of char=(#10);
-{$ELSE SHORT_LINEBREAK}
-  eollen=2;
-  eol : array[0..1] of char=(#13,#10);
-{$ENDIF SHORT_LINEBREAK}
 begin
   If InOutRes <> 0 then exit;
   case f.mode of
     fmOutput { fmAppend gets changed to fmOutPut in do_open (JM) }:
       begin
         { Write EOL }
-        WriteBuffer(f,eol,eollen);
+        WriteBuffer(f,(@sLineBreak+1)^,length(sLineBreak));
         { Flush }
         if f.FlushFunc<>nil then
           FileFunc(f.FlushFunc)(f);
@@ -1039,7 +1031,10 @@ end;
 
 {
   $Log$
-  Revision 1.4  2000-11-23 13:14:02  jonas
+  Revision 1.5  2001-03-21 23:29:40  florian
+    + sLineBreak and misc. stuff for Kylix compatiblity
+
+  Revision 1.4  2000/11/23 13:14:02  jonas
     * fix for web bug 1210 from Peter (merged)
 
   Revision 1.3  2000/07/14 10:33:10  michael

+ 7 - 2
rtl/os2/system.pas

@@ -129,12 +129,14 @@ const   UnusedHandle=$ffff;
 
         FileNameCaseSensitive : boolean = false;
 
+        sLineBreak : string[2] = #13#10;
+
 var
 { C-compatible arguments and environment }
   argc  : longint;external name '_argc';
   argv  : ppchar;external name '_argv';
   envp  : ppchar;external name '_environ';
-
+  DefaultTextLineBreakStyle : TTextLineBreakStyle = tlbsCRLF;
 
 implementation
 
@@ -954,7 +956,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.10  2001-03-21 21:08:20  hajny
+  Revision 1.11  2001-03-21 23:29:40  florian
+    + sLineBreak and misc. stuff for Kylix compatiblity
+
+  Revision 1.10  2001/03/21 21:08:20  hajny
     * GetDir fixed
 
   Revision 1.9  2001/03/10 09:57:51  hajny

+ 4 - 0
rtl/unix/sysunixh.inc

@@ -16,7 +16,11 @@ const
   StdOutputHandle = 1;
   StdErrorHandle  = 2;
 
+  sLineBreak : string[2] = #10;
+
 var
   argc : longint;
   argv : ppchar;
   envp : ppchar;
+  DefaultTextLineBreakStyle : TTextLineBreakStyle = tlbsLF;
+  

+ 11 - 4
rtl/win32/system.pp

@@ -57,6 +57,12 @@ const
 
    FileNameCaseSensitive : boolean = true;
 
+   sLineBreak : string[2] = #13#10;
+   DefaultTextLineBreakStyle : TTextLineBreakStyle = tlbsCRLF;
+
+   { Thread count for DLL }
+   Thread_count : longint = 0;
+
 type
   TStartupInfo=packed record
     cb : longint;
@@ -91,9 +97,7 @@ var
   cmdshow     : longint;
   DLLreason,DLLparam:longint;
   Win32StackTop : Dword;
-{ Thread count for DLL }
-const
-  Thread_count : longint = 0;
+
 type
   TDLL_Process_Entry_Hook = function (dllparam : longint) : longbool;
   TDLL_Entry_Hook = procedure (dllparam : longint);
@@ -1430,7 +1434,10 @@ end.
 
 {
   $Log$
-  Revision 1.8  2001-03-21 21:08:20  hajny
+  Revision 1.9  2001-03-21 23:29:40  florian
+    + sLineBreak and misc. stuff for Kylix compatiblity
+
+  Revision 1.8  2001/03/21 21:08:20  hajny
     * GetDir fixed
 
   Revision 1.7  2001/03/16 20:09:58  hajny