+ Conditionals fixed

rtl/go32v2/disk.inc

@@ -14,8 +14,6 @@
 
  **********************************************************************}
 
-{$ifdef Int64}
-
 TYPE  ExtendedFat32FreeSpaceRec=packed Record
          RetSize           : WORD; { (ret) size of returned structure}
          Strucversion      : WORD; {(call) structure version (0000h)
@@ -99,36 +97,6 @@ function disksize(drive : byte) : int64;
 begin
   disksize:=Do_DiskData(drive,false);
 end;
-{$else}
-
-Function DiskFree (Drive : Byte) : Longint;
-var
-  Regs: Registers;
-begin
-  Regs.Dl := Drive;
-  Regs.Ah := $36;
-  intr($21, Regs);
-  if Regs.Ax <> $FFFF then
-    result := Regs.Ax * Regs.Bx * Regs.Cx
-  else
-    result := -1;
-end;
-
-
-Function DiskSize (Drive : Byte) : Longint;
-var
-  Regs: Registers;
-begin
-  Regs.Dl := Drive;
-  Regs.Ah := $36;
-  Intr($21, Regs);
-  if Regs.Ax <> $FFFF then
-    result := Regs.Ax * Regs.Cx * Regs.Dx
-  else
-    result := -1;
-end;
-
-{$endif}
 
 
 Function GetCurrentDir : String;
@@ -166,7 +134,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:39  michael
+  Revision 1.3  2000-07-14 10:33:09  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:39  michael
   + removed logs
  
 }

rtl/go32v2/dos.pp

@@ -103,13 +103,8 @@ Procedure Exec(const path: pathstr; const comline: comstr);
 Function  DosExitCode: word;
 
 {Disk}
-{$ifdef Int64}
  Function  DiskFree(drive: byte) : int64;
  Function  DiskSize(drive: byte) : int64;
-{$else}
- Function  DiskFree(drive: byte) : longint;
- Function  DiskSize(drive: byte) : longint;
-{$endif}
 Procedure FindFirst(const path: pathstr; attr: word; var f: searchRec);
 Procedure FindNext(var f: searchRec);
 Procedure FindClose(Var f: SearchRec);
@@ -449,7 +444,6 @@ end;
                                --- Disk ---
 ******************************************************************************}
 
-{$ifdef Int64}
 
 TYPE  ExtendedFat32FreeSpaceRec=packed Record
          RetSize           : WORD; { (ret) size of returned structure}
@@ -532,34 +526,6 @@ function disksize(drive : byte) : int64;
 begin
   disksize:=Do_DiskData(drive,false);
 end;
-{$else}
-
-function diskfree(drive : byte) : longint;
-begin
-  DosError:=0;
-  dosregs.dl:=drive;
-  dosregs.ah:=$36;
-  msdos(dosregs);
-  if dosregs.ax<>$FFFF then
-   diskfree:=dosregs.ax*dosregs.bx*dosregs.cx
-  else
-   diskfree:=-1;
-end;
-
-
-function disksize(drive : byte) : longint;
-begin
-  DosError:=0;
-  dosregs.dl:=drive;
-  dosregs.ah:=$36;
-  msdos(dosregs);
-  if dosregs.ax<>$FFFF then
-   disksize:=dosregs.ax*dosregs.cx*dosregs.dx
-  else
-   disksize:=-1;
-end;
-
-{$endif}
 
 
 {******************************************************************************
@@ -1173,7 +1139,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:39  michael
+  Revision 1.3  2000-07-14 10:33:09  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:39  michael
   + removed logs
  
 }

rtl/i386/i386.inc

@@ -566,11 +566,7 @@ asm
         { esi contains the vmt }
         pushl   %esi
         { call newinstance (class method!) }
-{$ifdef NEWVMTOFFSET}
         call    *52{vmtNewInstance}(%esi)
-{$else}
-        call    *16(%esi)
-{$endif}
         popl    %edx
         popl    %ecx
         popl    %ebx
@@ -604,11 +600,7 @@ asm
         { push self }
         pushl   %esi
         { call freeinstance }
-{$ifdef NEWVMTOFFSET}
         call    *56{vmtFreeInstance}(%edi)
-{$else}
-        call    *20(%edi)
-{$endif}
         popl    %edx
         popl    %ecx
         popl    %ebx
@@ -1127,36 +1119,12 @@ end;
 {$endif def SYSTEMDEBUG}
 
 
-{$ifndef HASSAVEREGISTERS}
-
-{****************************************************************************
-                                 IoCheck
-****************************************************************************}
-{$define FPC_SYSTEM_HAS_FPC_IOCHECK}
-
-procedure int_iocheck(addr : longint);[public,alias:'FPC_IOCHECK'];
-var
-  l : longint;
-begin
-  asm
-        pushal
-  end;
-  if InOutRes<>0 then
-   begin
-     l:=InOutRes;
-     InOutRes:=0;
-     HandleErrorFrame(l,get_frame);
-   end;
-  asm
-        popal
-  end;
-end;
-
-{$endif not HASSAVEREGISTERS}
-
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:41  michael
+  Revision 1.3  2000-07-14 10:33:09  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:41  michael
   + removed logs
  
 }

rtl/i386/math.inc

@@ -19,7 +19,6 @@
                        EXTENDED data type routines
  ****************************************************************************}
 
-{$ifdef hasinternmath}
     function pi : extended;[internproc:in_pi];
     function abs(d : extended) : extended;[internproc:in_abs_extended];
     function sqr(d : extended) : extended;[internproc:in_sqr_extended];
@@ -28,90 +27,6 @@
     function ln(d : extended) : extended;[internproc:in_ln_extended];
     function sin(d : extended) : extended;[internproc:in_sin_extended];
     function cos(d : extended) : extended;[internproc:in_cos_extended];
-{$else hasinternmath}
-    function pi : extended;assembler;[internconst:in_const_pi];
-      asm
-            fldpi
-      end [];
-
-
-    function abs(d : extended) : extended;assembler;[internconst:in_const_abs];
-      asm
-            fldt d
-            fabs
-      end [];
-
-
-    function sqr(d : extended) : extended;assembler;[internconst:in_const_sqr];
-      asm
-            fldt d
-            fldt d
-            fmulp %st(1)
-      end [];
-
-
-    function sqrt(d : extended) : extended;assembler;[internconst:in_const_sqrt];
-      asm
-            fldt d
-            fsqrt
-      end [];
-
-
-    function arctan(d : extended) : extended;assembler;[internconst:in_const_arctan];
-      asm
-            fldt d
-            fld1
-            fpatan
-      end [];
-
-    function cos(d : extended) : extended;assembler;[internconst:in_const_cos];
-      asm
-            fldt d
-            fcos
-            fstsw
-            sahf
-            jnp .LCOS1
-            fstp %st(0)
-            fldt .LCOS0
-            jmp .LCOS1
-         .data
-         .LCOS0:
-            .long       0xffffffff
-            .long       0xffffffff
-            .long       0xffffffff
-         .text
-         .LCOS1:
-      end ['EAX'];
-
-    function ln(d : extended) : extended;assembler;[internconst:in_const_ln];
-      asm
-            fldln2
-            fldt d
-            fyl2x
-      end [];
-
-
-    function sin(d : extended) : extended;assembler;[internconst:in_const_sin];
-      asm
-            fldt d
-            fsin
-            fstsw
-            sahf
-            jnp .LSIN1
-            fstp %st(0)
-            fldt .LSIN0
-            jmp .LSIN1
-         .data
-         .LSIN0:
-            .long       0xffffffff
-            .long       0xffffffff
-            .long       0xffffffff
-         .text
-         .LSIN1:
-      end ['EAX'];
-
-
-{$endif hasinternmath}
 
     function exp(d : extended) : extended;assembler;[internconst:in_const_exp];
        asm
@@ -384,7 +299,10 @@
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:41  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:41  michael
   + removed logs
  
 }

rtl/inc/generic.inc

@@ -724,33 +724,12 @@ end;
 {$endif ndef FPC_SYSTEM_HAS_FPC_BOUNDCHECK}
 
 
-{$ifndef HASSAVEREGISTERS}
-
-{****************************************************************************
-                                 IoCheck
-****************************************************************************}
-
-{$ifndef FPC_SYSTEM_HAS_FPC_IOCHECK}
-
-procedure int_iocheck(addr : longint);[public,alias:'FPC_IOCHECK'];
-var
-  l : longint;
-begin
-  if InOutRes<>0 then
-   begin
-     l:=InOutRes;
-     InOutRes:=0;
-     HandleErrorFrame(l,get_frame);
-   end;
-end;
-
-{$endif ndef FPC_SYSTEM_HAS_FPC_IOCHECK}
-
-{$endif}
-
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:43  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:43  michael
   + removed logs
  
 }

rtl/inc/heap.inc

@@ -126,13 +126,13 @@ begin
 end;
 
 
-procedure GetMem(Var p:pointer;Size:Longint);{$ifndef NEWMM}[public,alias:'FPC_GETMEM'];{$endif}
+procedure GetMem(Var p:pointer;Size:Longint);
 begin
   p:=MemoryManager.GetMem(Size);
 end;
 
 
-procedure FreeMem(Var p:pointer;Size:Longint);{$ifndef NEWMM}[public,alias:'FPC_FREEMEM'];{$endif}
+procedure FreeMem(Var p:pointer;Size:Longint);
 begin
   MemoryManager.FreeMemSize(p,Size);
   p:=nil;
@@ -190,13 +190,13 @@ end;
 
 
 { Needed for calls from Assembler }
-procedure AsmGetMem(var p:pointer;size:longint);{$ifdef NEWMM}[public,alias:'FPC_GETMEM'];{$endif}
+procedure AsmGetMem(var p:pointer;size:longint);[public,alias:'FPC_GETMEM'];
 begin
   p:=MemoryManager.GetMem(size);
 end;
 
 
-procedure AsmFreeMem(var p:pointer);{$ifdef NEWMM}[public,alias:'FPC_FREEMEM'];{$endif}
+procedure AsmFreeMem(var p:pointer);[public,alias:'FPC_FREEMEM'];
 begin
   if p <> nil then
    begin
@@ -1021,7 +1021,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:43  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:43  michael
   + removed logs
  
 }

rtl/inc/objpash.inc

@@ -19,7 +19,6 @@
 *****************************************************************************}
 
     const
-{$ifdef NEWVMTOFFSET}
        vmtInstanceSize         = 0;
        vmtParent               = 8;
        { These were negative value's, but are now positive, else classes
@@ -44,27 +43,6 @@
        vmtAfterConstruction    = vmtMethodStart+20;
        vmtBeforeDestruction    = vmtMethodStart+24;
        vmtDefaultHandlerStr    = vmtMethodStart+28;
-{$else}
-       vmtMsgStrPtr            = -36;
-       vmtIntfTable            = -32;
-       vmtAutoTable            = -28;
-       vmtInitTable            = -24;
-       vmtTypeInfo             = -20;
-       vmtFieldTable           = -16;
-       vmtMethodTable          = -12;
-       vmtDynamicTable         = -8;
-       vmtClassName            = -4;
-       vmtInstanceSize         = 0;
-       vmtParent               = 8;
-       vmtDestroy              = 12;
-       vmtNewInstance          = 16;
-       vmtFreeInstance         = 20;
-       vmtSafeCallException    = 24;
-       vmtDefaultHandler       = 28;
-       vmtAfterConstruction    = 32;
-       vmtBeforeDestruction    = 36;
-       vmtDefaultHandlerStr    = 40;
-{$endif}
 
     type
        { some pointer definitions }
@@ -233,7 +211,10 @@
        end;
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:45  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:45  michael
   + removed logs
  
 }

rtl/inc/system.inc

@@ -67,12 +67,10 @@ Function  hi(w : Word) : byte;     [INTERNPROC: In_hi_Word];
 Function  hi(l : Longint) : Word;  [INTERNPROC: In_hi_long];
 Function  hi(l : DWord) : Word;    [INTERNPROC: In_hi_long];
 
-{$ifdef INT64}
 Function  lo(q : QWord) : DWord;  [INTERNPROC: In_lo_qword];
 Function  lo(i : Int64) : DWord;  [INTERNPROC: In_lo_qword];
 Function  hi(q : QWord) : DWord;  [INTERNPROC: In_hi_qword];
 Function  hi(i : Int64) : DWord;  [INTERNPROC: In_hi_qword];
-{$endif}
 
 Function chr(b : byte) : Char;      [INTERNPROC: In_chr_byte];
 Function Length(s : string) : byte; [INTERNPROC: In_Length_string];
@@ -148,7 +146,6 @@ Begin
   Swap:=(X and $ffff) shl 16 + (X shr 16)
 End;
 
-{$ifdef INT64}
 Function Swap (X : QWord) : QWord;
 Begin
   Swap:=(X and $ffffffff) shl 32 + (X shr 32);
@@ -158,7 +155,6 @@ Function swap (X : Int64) : Int64;
 Begin
   Swap:=(X and $ffffffff) shl 32 + (X shr 32);
 End;
-{$endif}
 
 {$endif RTLLITE}
 
@@ -186,9 +182,7 @@ End;
 {$i rtti.inc}
 
 { requires sstrings.inc for initval }
-{$ifdef INT64}
 {$I int64.inc}
-{$endif INT64}
 
 
 {****************************************************************************
@@ -343,7 +337,6 @@ begin
 end;
 
 
-{$ifdef HASSAVEREGISTERS}
 procedure int_iocheck(addr : longint);[saveregisters,public,alias:'FPC_IOCHECK'];
 var
   l : longint;
@@ -355,8 +348,6 @@ begin
      HandleErrorFrame(l,get_frame);
    end;
 end;
-{$endif}
-
 
 Function IOResult:Word;
 Begin
@@ -600,7 +591,7 @@ begin
 end;
 
 
-Procedure int_assert(Const Msg,FName:Shortstring;LineNo,ErrorAddr:Longint); [{$ifdef HASSAVEREGISTERS}SaveRegisters,{$endif}Public,Alias : 'FPC_ASSERT'];
+Procedure int_assert(Const Msg,FName:Shortstring;LineNo,ErrorAddr:Longint); [SaveRegisters,Public,Alias : 'FPC_ASSERT'];
 begin
   if pointer(AssertErrorProc)<>nil then
     AssertErrorProc(Msg,FName,LineNo,ErrorAddr)
@@ -647,7 +638,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:45  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:45  michael
   + removed logs
  
 }

rtl/inc/systemh.inc

@@ -206,14 +206,12 @@ Function  Swap (X:Word):Word;
 Function  Swap (X:Integer):Integer;
 Function  Swap (X:Cardinal):Cardinal;
 Function  Swap (X:LongInt):LongInt;
-{$ifdef INT64}
 Function  lo(q : QWord) : DWord;
 Function  lo(i : Int64) : DWord;
 Function  hi(q : QWord) : DWord;
 Function  hi(i : Int64) : DWord;
 Function  Swap (X:QWord):QWord;
 Function  Swap (X:Int64):Int64;
-{$endif}
 {$endif RTLLITE}
 
 Function  Random(l:cardinal):cardinal;
@@ -445,7 +443,10 @@ const
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:45  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:45  michael
   + removed logs
  
 }

rtl/inc/text.inc

@@ -558,7 +558,6 @@ Begin
 End;
 
 
-{$ifdef INT64}
 procedure write_qword(len : longint;var t : textrec;q : qword);[public,alias:'FPC_WRITE_TEXT_QWORD'];
 var
   s : string;
@@ -578,7 +577,6 @@ begin
   int64_str(i,s);
   write_str(len,t,s);
 end;
-{$endif INT64}
 
 
 Procedure Write_Float(rt,fixkomma,Len : Longint;var t : TextRec;r : ValReal);[Public,Alias:'FPC_WRITE_TEXT_FLOAT'];
@@ -944,7 +942,6 @@ begin
 end;
 
 
-{$ifdef INT64}
 function Read_QWord(var f : textrec) : qword;[public,alias:'FPC_READ_TEXT_QWORD'];
 var
   hs   : String;
@@ -1002,7 +999,6 @@ Begin
   If code<>0 Then
    InOutRes:=106;
 End;
-{$endif INT64}
 
 
 {*****************************************************************************
@@ -1031,7 +1027,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:46  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:46  michael
   + removed logs
  
 }

rtl/linux/disk.inc

@@ -50,7 +50,6 @@ end;
 
 
 
-{$ifdef INT64}
 
 Function DiskFree(Drive: Byte): int64;
 var
@@ -76,35 +75,6 @@ Begin
    DiskSize:=-1;
 End;
 
-{$else}
-
-Function DiskFree(Drive: Byte): Longint;
-var
-  fs : statfs;
-Begin
-  if ((Drive<4) and (not (fixdrivestr[Drive]=nil)) and fsstat(StrPas(fixdrivestr[drive]),fs)) or
-     ((not (drivestr[Drive]=nil)) and fsstat(StrPas(drivestr[drive]),fs)) then
-   Diskfree:=fs.bavail*fs.bsize
-  else
-   Diskfree:=-1;
-End;
-
-
-
-Function DiskSize(Drive: Byte): Longint;
-var
-  fs : statfs;
-Begin
-  if ((Drive<4) and (not (fixdrivestr[Drive]=nil)) and fsstat(StrPas(fixdrivestr[drive]),fs)) or
-     ((not (drivestr[Drive]=nil)) and fsstat(StrPas(drivestr[drive]),fs)) then
-   DiskSize:=fs.blocks*fs.bsize
-  else
-   DiskSize:=-1;
-End;
-
-{$endif INT64}
-
-
 
 Function GetCurrentDir : String;
 begin
@@ -141,7 +111,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:48  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:48  michael
   + removed logs
  
 }

rtl/linux/dos.pp

@@ -116,13 +116,8 @@ Function  DosExitCode: word;
 
 {Disk}
 Procedure AddDisk(const path:string);
-{$ifdef Int64}
- Function  DiskFree(drive: byte) : int64;
- Function  DiskSize(drive: byte) : int64;
-{$else}
- Function  DiskFree(drive: byte) : longint;
- Function  DiskSize(drive: byte) : longint;
-{$endif}
+Function  DiskFree(drive: byte) : int64;
+Function  DiskSize(drive: byte) : int64;
 Procedure FindFirst(const path: pathstr; attr: word; var f: searchRec);
 Procedure FindNext(var f: searchRec);
 Procedure FindClose(Var f: SearchRec);
@@ -400,8 +395,6 @@ end;
 
 
 
-{$ifdef INT64}
-
 Function DiskFree(Drive: Byte): int64;
 var
   fs : statfs;
@@ -426,34 +419,6 @@ Begin
    DiskSize:=-1;
 End;
 
-{$else}
-
-Function DiskFree(Drive: Byte): Longint;
-var
-  fs : statfs;
-Begin
-  if ((Drive<4) and (not (fixdrivestr[Drive]=nil)) and fsstat(StrPas(fixdrivestr[drive]),fs)) or
-     ((not (drivestr[Drive]=nil)) and fsstat(StrPas(drivestr[drive]),fs)) then
-   Diskfree:=fs.bavail*fs.bsize
-  else
-   Diskfree:=-1;
-End;
-
-
-
-Function DiskSize(Drive: Byte): Longint;
-var
-  fs : statfs;
-Begin
-  if ((Drive<4) and (not (fixdrivestr[Drive]=nil)) and fsstat(StrPas(fixdrivestr[drive]),fs)) or
-     ((not (drivestr[Drive]=nil)) and fsstat(StrPas(drivestr[drive]),fs)) then
-   DiskSize:=fs.blocks*fs.bsize
-  else
-   DiskSize:=-1;
-End;
-
-{$endif INT64}
-
 
 {******************************************************************************
                        --- Findfirst FindNext ---
@@ -914,7 +879,10 @@ End.
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:48  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:48  michael
   + removed logs
  
 }

rtl/linux/syslinux.pp

@@ -605,16 +605,10 @@ const
 Procedure ResetFPU;
 begin
 {$ifdef I386}
-{$ifndef CORRECTFLDCW}
-  {$asmmode direct}
-{$endif}
   asm
     fninit
     fldcw   fpucw
   end;
-{$ifndef CORRECTFLDCW}
-  {$asmmode att}
-{$endif}
 {$endif I386}
 end;
 
@@ -793,7 +787,10 @@ End.
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:49  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:49  michael
   + removed logs
  
 }

rtl/m68k/lowmath.inc

@@ -14,7 +14,7 @@
  **********************************************************************}
 {*************************************************************************}
 {  lowmath.inc                                                            }
-{  Ported to FPK-Pascal by Carl Eric Codere                               }
+{  Ported to FPC-Pascal by Carl Eric Codere                               }
 {  Terms of use: This source code is freeware.                            }
 {*************************************************************************}
 {  This inc. implements low-level mathemtical routines  for the motorola  }
@@ -914,7 +914,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:50  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:50  michael
   + removed logs
  
 }

rtl/objpas/diskh.inc

@@ -23,8 +23,8 @@ Function RemoveDir (Const Dir : String) : Boolean;
 
 {
   $Log$
-  Revision 1.3  2000-07-14 09:31:37  michael
-  + Forgot int64
+  Revision 1.4  2000-07-14 10:33:10  michael
+  + Conditionals fixed
 
   Revision 1.2  2000/07/13 11:33:51  michael
   + removed logs

rtl/objpas/objpas.pp

@@ -29,10 +29,6 @@ unit objpas;
        integer = longint;
 
 { Old compilers search for these variables in objpas unit }
-{$ifndef SYSTEMTVARREC}
-       pvarrec = system.pvarrec;
-       tvarrec = system.tvarrec;
-{$endif}
 
 {****************************************************************************
                              Compatibility routines.
@@ -61,7 +57,6 @@ unit objpas;
      Function ParamStr(Param : Integer) : Ansistring;
 
 
-{$ifdef HasResourceStrings}
 Type
    TResourceIterator = Function (Name,Value : AnsiString; Hash : Longint) : AnsiString;
 
@@ -76,7 +71,6 @@ Type
    Function GetResourceStringCurrentValue(TableIndex,StringIndex : Longint) : AnsiString;
    Function SetResourceStringValue(TableIndex,StringIndex : longint; Value : Ansistring) : Boolean;
 
-{$endif}
 
 
   implementation
@@ -176,7 +170,6 @@ begin
   end;
 
 
-{$IFDEF HasResourceStrings}
 
 { ---------------------------------------------------------------------
     ResourceString support
@@ -346,13 +339,9 @@ begin
    ResourceStringTable.Tables[TableIndex]^.ResRec[StringIndex].CurrentValue:=Value;
 end;
 
-{$endif}
-
 
 Initialization
-{$IFDEF HasResourceStrings}
   ResetResourceTables;
-{$endif}
 
 finalization
 
@@ -360,7 +349,10 @@ end.
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:51  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:51  michael
   + removed logs
  
 }

rtl/objpas/sysutils.pp

@@ -275,7 +275,7 @@ begin
   else
    E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]);
   end;
-  Raise E at longint(Address){$ifdef ENHANCEDRAISE},longint(Frame){$endif};
+  Raise E at longint(Address),longint(Frame);
 end;
 
 
@@ -402,7 +402,10 @@ Finalization
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:51  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:51  michael
   + removed logs
  
 }

rtl/os2/disk.inc

@@ -16,8 +16,6 @@
 
 {$ASMMODE ATT}
 
-{$IFDEF INT64}
-
 function DiskFree (Drive: byte): int64;
 
 var FI: TFSinfo;
@@ -95,86 +93,6 @@ begin
         end;
 end;
 
-{$ELSE}
-
-function DiskFree (Drive: byte): longint;
-
-var FI: TFSinfo;
-    RC: longint;
-
-begin
-    if (os_mode = osDOS) or (os_mode = osDPMI) then
-    {Function 36 is not supported in OS/2.}
-        asm
-            movb 8(%ebp),%dl
-            movb $0x36,%ah
-            call syscall
-            cmpw $-1,%ax
-            je .LDISKFREE1
-            mulw %cx
-            mulw %bx
-            shll $16,%edx
-            movw %ax,%dx
-            xchgl %edx,%eax
-            leave
-            ret
-         .LDISKFREE1:
-            cltd
-            leave
-            ret
-        end
-    else
-        {In OS/2, we use the filesystem information.}
-        begin
-            RC := DosQueryFSInfo (Drive, 1, FI, SizeOf (FI));
-            if RC = 0 then
-                DiskFree := FI.Free_Clusters *
-                                   FI.Sectors_Per_Cluster * FI.Bytes_Per_Sector
-            else
-                DiskFree := -1;
-        end;
-end;
-
-function DiskSize (Drive: byte): longint;
-
-var FI: TFSinfo;
-    RC: longint;
-
-begin
-    if (os_mode = osDOS) or (os_mode = osDPMI) then
-        {Function 36 is not supported in OS/2.}
-        asm
-            movb 8(%ebp),%dl
-            movb $0x36,%ah
-            call syscall
-            movw %dx,%bx
-            cmpw $-1,%ax
-            je .LDISKSIZE1
-            mulw %cx
-            mulw %bx
-            shll $16,%edx
-            movw %ax,%dx
-            xchgl %edx,%eax
-            leave
-            ret
-        .LDISKSIZE1:
-            cltd
-            leave
-            ret
-        end
-    else
-        {In OS/2, we use the filesystem information.}
-        begin
-            RC := DosQueryFSinfo (Drive, 1, FI, SizeOf (FI));
-            if RC = 0 then
-                DiskSize := FI.Total_Clusters *
-                                   FI.Sectors_Per_Cluster * FI.Bytes_Per_Sector
-            else
-                DiskSize := -1;
-        end;
-end;
-
-{$ENDIF}
 
 function GetCurrentDir: string;
 begin
@@ -212,7 +130,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:52  michael
+  Revision 1.3  2000-07-14 10:33:10  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:33:52  michael
   + removed logs
  
 }

rtl/os2/dive.pas

@@ -328,20 +328,10 @@ End.
 
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:04  michael
-  + Initial import
-
-  Revision 1.4  2000/02/09 16:59:33  peter
-    * truncated log
-
-  Revision 1.3  2000/01/09 20:51:03  hajny
-    * FPK changed to FPC
-
-  Revision 1.2  2000/01/07 16:41:45  daniel
-    * copyright 2000
-
-  Revision 1.1  1999/10/01 11:17:09  hajny
-    + initial version
+  Revision 1.2  2000-07-14 10:33:10  michael
+  + Conditionals fixed
 
+  Revision 1.1  2000/07/13 06:31:04  michael
+  + Initial import
 
 }

rtl/os2/dos.pas

@@ -140,13 +140,8 @@ procedure setcbreak(breakvalue:boolean);
 procedure getverify(var verify:boolean);
 procedure setverify(verify : boolean);
 
-{$IFDEF INT64}
 function DiskFree (Drive: byte) : int64;
 function DiskSize (Drive: byte) : int64;
-{$ELSE}
-function DiskFree (Drive: byte) : longint;
-function DiskSize (Drive: byte) : longint;
-{$ENDIF}
 
 procedure findfirst(const path:pathstr;attr:word;var f:searchRec);
 procedure findnext(var f:searchRec);
@@ -679,7 +674,6 @@ begin
     end;
 end;
 
-{$IFDEF INT64}
 
 function DiskFree (Drive: byte): int64;
 
@@ -758,86 +752,6 @@ begin
         end;
 end;
 
-{$ELSE}
-
-function DiskFree (Drive: byte): longint;
-
-var FI: TFSinfo;
-    RC: longint;
-
-begin
-    if (os_mode = osDOS) or (os_mode = osDPMI) then
-    {Function 36 is not supported in OS/2.}
-        asm
-            movb 8(%ebp),%dl
-            movb $0x36,%ah
-            call syscall
-            cmpw $-1,%ax
-            je .LDISKFREE1
-            mulw %cx
-            mulw %bx
-            shll $16,%edx
-            movw %ax,%dx
-            xchgl %edx,%eax
-            leave
-            ret
-         .LDISKFREE1:
-            cltd
-            leave
-            ret
-        end
-    else
-        {In OS/2, we use the filesystem information.}
-        begin
-            RC := DosQueryFSInfo (Drive, 1, FI, SizeOf (FI));
-            if RC = 0 then
-                DiskFree := FI.Free_Clusters *
-                                   FI.Sectors_Per_Cluster * FI.Bytes_Per_Sector
-            else
-                DiskFree := -1;
-        end;
-end;
-
-function DiskSize (Drive: byte): longint;
-
-var FI: TFSinfo;
-    RC: longint;
-
-begin
-    if (os_mode = osDOS) or (os_mode = osDPMI) then
-        {Function 36 is not supported in OS/2.}
-        asm
-            movb 8(%ebp),%dl
-            movb $0x36,%ah
-            call syscall
-            movw %dx,%bx
-            cmpw $-1,%ax
-            je .LDISKSIZE1
-            mulw %cx
-            mulw %bx
-            shll $16,%edx
-            movw %ax,%dx
-            xchgl %edx,%eax
-            leave
-            ret
-        .LDISKSIZE1:
-            cltd
-            leave
-            ret
-        end
-    else
-        {In OS/2, we use the filesystem information.}
-        begin
-            RC := DosQueryFSinfo (Drive, 1, FI, SizeOf (FI));
-            if RC = 0 then
-                DiskSize := FI.Total_Clusters *
-                                   FI.Sectors_Per_Cluster * FI.Bytes_Per_Sector
-            else
-                DiskSize := -1;
-        end;
-end;
-
-{$ENDIF}
 
 procedure SearchRec2DosSearchRec (var F: SearchRec);
 
@@ -1209,55 +1123,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:04  michael
-  + Initial import
-
-  Revision 1.28  2000/07/06 18:57:40  hajny
-    * SetFTime for OS/2 mode corrected
-
-  Revision 1.27  2000/06/05 18:50:55  hajny
-    * SetDate, SetTime corrected
-
-  Revision 1.26  2000/06/01 18:38:46  hajny
-    * warning about SetDate added (TODO)
-
-  Revision 1.25  2000/05/28 18:20:16  hajny
-    * DiskFree/DiskSize updated
-
-  Revision 1.24  2000/05/21 16:06:38  hajny
-    + FSearch and Find* reworked
+  Revision 1.2  2000-07-14 10:33:10  michael
+  + Conditionals fixed
 
-  Revision 1.23  2000/04/18 20:30:02  hajny
-    * FSearch with given path corrected
-
-  Revision 1.22  2000/03/12 18:32:17  hajny
-    * missing parentheses added
-
-  Revision 1.21  2000/03/05 19:00:37  hajny
-    * DiskFree, DiskSize - int64 result, fix for osDPMI mode
-
-  Revision 1.20  2000/02/09 16:59:33  peter
-    * truncated log
-
-  Revision 1.19  2000/01/09 20:51:03  hajny
-    * FPK changed to FPC
-
-  Revision 1.18  2000/01/07 16:41:45  daniel
-    * copyright 2000
-
-  Revision 1.17  1999/10/13 12:21:56  daniel
-  * OS/2 compiler works again.
-
-  Revision 1.16  1999/09/13 18:21:02  hajny
-    * again didn't manage to read docu for DosFindFirst properly :-(
-
-  Revision 1.15  1999/09/13 17:56:26  hajny
-    * another correction to FSearch fix - mistyping
-
-  Revision 1.14  1999/09/13 17:35:15  hajny
-    * little addition/correction to FSearch fix
-
-  Revision 1.13  1999/09/09 09:20:43  hajny
-    * FSearch under OS/2 fixed
+  Revision 1.1  2000/07/13 06:31:04  michael
+  + Initial import
 
 }

rtl/os2/doscalls.pas

@@ -3953,31 +3953,10 @@ external 'DOSCALLS' index 582;
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:04  michael
-  + Initial import
-
-  Revision 1.13  2000/05/09 17:29:52  hajny
-    * DosGetInfoBlocks updated again
-
-  Revision 1.12  2000/04/01 10:46:07  hajny
-    * DosGetInfoBloBlocks updated
-
-  Revision 1.11  2000/01/09 20:51:03  hajny
-    * FPK changed to FPC
-
-  Revision 1.10  2000/01/07 16:41:46  daniel
-    * copyright 2000
+  Revision 1.2  2000-07-14 10:33:10  michael
+  + Conditionals fixed
 
-  Revision 1.9  2000/01/07 16:32:30  daniel
-    * copyright 2000 added
-
-  Revision 1.8  1999/12/26 19:30:18  hajny
-    * cdecl modifications
-
-  Revision 1.7  1999/12/18 18:32:38  hajny
-    + Starting cdecl additions
-
-  Revision 1.6  1999/08/10 14:18:40  hajny
-    * corrected characters >127 broken by DBCS editor
+  Revision 1.1  2000/07/13 06:31:04  michael
+  + Initial import
 
 }

rtl/os2/os2def.pas

@@ -289,22 +289,10 @@ const
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:06  michael
-  + Initial import
-
-  Revision 1.10  2000/01/09 20:48:04  hajny
-    * FPK changed to FPC
-
-  Revision 1.9  2000/01/07 16:41:48  daniel
-    * copyright 2000
+  Revision 1.2  2000-07-14 10:33:11  michael
+  + Conditionals fixed
 
-  Revision 1.8  2000/01/07 16:32:32  daniel
-    * copyright 2000 added
-
-  Revision 1.7  1999/08/10 14:20:54  hajny
-    * compatibility updates
-
-  Revision 1.6  1999/08/05 07:37:27  hajny
-    * 'solution' for a compiler problem
+  Revision 1.1  2000/07/13 06:31:06  michael
+  + Initial import
 
 }

rtl/os2/pmbitmap.pas

@@ -200,25 +200,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:06  michael
-  + Initial import
-
-  Revision 1.10  2000/02/09 16:59:33  peter
-    * truncated log
-
-  Revision 1.9  2000/01/09 20:48:04  hajny
-    * FPK changed to FPC
-
-  Revision 1.8  2000/01/07 16:41:48  daniel
-    * copyright 2000
+  Revision 1.2  2000-07-14 10:33:11  michael
+  + Conditionals fixed
 
-  Revision 1.7  2000/01/07 16:32:32  daniel
-    * copyright 2000 added
-
-  Revision 1.6  1999/09/15 09:13:49  hajny
-    * mistyping corrected
-
-  Revision 1.5  1999/08/04 15:51:10  hajny
-    * merging changes by RB and DM :-(
+  Revision 1.1  2000/07/13 06:31:06  michael
+  + Initial import
 
 }

rtl/os2/pmgpi.pas

@@ -1228,22 +1228,9 @@ function GpiPolygons(hps,ulCount : cardinal;var paplgn : POLYGON;flOptions,flMod
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:06  michael
-  + Initial import
-
-  Revision 1.10  2000/02/09 16:59:33  peter
-    * truncated log
-
-  Revision 1.9  2000/01/09 20:48:04  hajny
-    * FPK changed to FPC
-
-  Revision 1.8  2000/01/07 16:41:48  daniel
-    * copyright 2000
-
-  Revision 1.7  2000/01/07 16:32:32  daniel
-    * copyright 2000 added
-
-  Revision 1.6  1999/08/04 15:51:07  hajny
-    * merging changes by RB and DM :-(
+  Revision 1.2  2000-07-14 10:33:11  michael
+  + Conditionals fixed
 
+  Revision 1.1  2000/07/13 06:31:06  michael
+  + Initial import
 }

rtl/os2/pmwin.pas

@@ -2295,25 +2295,10 @@ const
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:06  michael
-  + Initial import
-
-  Revision 1.11  2000/02/09 16:59:33  peter
-    * truncated log
-
-  Revision 1.10  2000/01/09 20:48:04  hajny
-    * FPK changed to FPC
-
-  Revision 1.9  2000/01/07 16:41:49  daniel
-    * copyright 2000
+  Revision 1.2  2000-07-14 10:33:11  michael
+  + Conditionals fixed
 
-  Revision 1.8  2000/01/07 16:32:33  daniel
-    * copyright 2000 added
-
-  Revision 1.7  1999/08/10 14:20:52  hajny
-    * compatibility updates
-
-  Revision 1.6  1999/08/04 15:51:05  hajny
-    * merging changes by RB and DM :-(
+  Revision 1.1  2000/07/13 06:31:06  michael
+  + Initial import
 
 }

rtl/os2/sysos2.pas

@@ -806,62 +806,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.1  2000-07-13 06:31:07  michael
-  + Initial import
-
-  Revision 1.34  2000/07/09 17:09:47  hajny
-    * little mistyping
-
-  Revision 1.33  2000/07/09 17:05:24  hajny
-    * default sharing mode changed to deny all (compatibility)
-
-  Revision 1.32  2000/06/11 09:47:57  hajny
-    * error handling and sharing corrected
-
-  Revision 1.31  2000/06/05 18:53:30  hajny
-    * FileHandleCount handling for OS/2 added
-
-  Revision 1.30  2000/06/04 14:14:01  hajny
-    * do_truncate corrected, do_open might work under W9x now
-
-  Revision 1.29  2000/05/28 18:17:39  hajny
-    do_isdevice corrected
-
-  Revision 1.28  2000/05/21 15:58:50  hajny
-    + FileNameCaseSensitive added
-
-  Revision 1.27  2000/04/07 17:47:34  hajny
-    * got rid of os.inc
-
-  Revision 1.26  2000/02/09 16:59:34  peter
-    * truncated log
+  Revision 1.2  2000-07-14 10:33:11  michael
+  + Conditionals fixed
 
-  Revision 1.25  2000/02/09 12:39:11  peter
-    * halt moved to system.inc
-
-  Revision 1.24  2000/01/20 23:38:02  peter
-    * support fm_inout as stdoutput for assign(f,'');rewrite(f,1); becuase
-      rewrite opens always with filemode 2
-
-  Revision 1.23  2000/01/16 23:10:15  peter
-    * handle check fixed
-
-  Revision 1.22  2000/01/16 22:25:38  peter
-    * check handle for file closing
-
-  Revision 1.21  2000/01/09 20:45:58  hajny
-    * FPK changed to FPC
-
-  Revision 1.20  2000/01/07 16:41:50  daniel
-    * copyright 2000
-
-  Revision 1.19  2000/01/07 16:32:33  daniel
-    * copyright 2000 added
-
-  Revision 1.18  2000/01/02 17:45:25  hajny
-    * cdecl added for doscalls routines
-
-  Revision 1.17  1999/09/10 15:40:35  peter
-    * fixed do_open flags to be > $100, becuase filemode can be upto 255
+  Revision 1.1  2000/07/13 06:31:07  michael
+  + Initial import
 
 }

rtl/win32/wininc/makefile.inc

@@ -1,14 +1,11 @@
 WINDOWS_FILES=base errors defines struct redef \
               ascfun ascdef unifun unidef func
 
-#
-#  $Log$
-#  Revision 1.4  2000-07-14 06:57:57  michael
-#  + Fixed log better
-#
-#  Revision 1.3  2000/07/14 06:57:11  michael
-#  + Fixed log
-#
-#  Revision 1.2  2000/07/13 11:34:00  michael
-#  + removed logs
-# 
+  $Log$
+  Revision 1.5  2000-07-14 10:33:12  michael
+  + Conditionals fixed
+
+  Revision 1.2  2000/07/13 11:34:00  michael
+  + removed logs
+ 
+}