* delphi compile fixes

compiler/cg386add.pas

@@ -20,10 +20,10 @@
 
  ****************************************************************************
 }
-{$ifdef FPC}
-  {$goto on}
-{$endif FPC}
 unit cg386add;
+
+{$i defines.inc}
+
 interface
 
 {$define usecreateset}
@@ -839,7 +839,7 @@ implementation
          { calculate the operator which is more difficult }
          firstcomplex(p);
 
-         
+
          { handling boolean expressions extra: }
          if is_boolean(p^.left^.resulttype) and
             is_boolean(p^.right^.resulttype) then
@@ -2374,7 +2374,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  2000-09-21 12:23:49  jonas
+  Revision 1.8  2000-09-24 21:19:48  peter
+    * delphi compile fixes
+
+  Revision 1.7  2000/09/21 12:23:49  jonas
     * small fix to my changes for full boolean evaluation support (moved
       opsize determination for boolean operations back in boolean
       processing block)

compiler/cg386cal.pas

@@ -20,10 +20,10 @@
 
  ****************************************************************************
 }
-{$ifdef FPC}
-  {$goto on}
-{$endif FPC}
 unit cg386cal;
+
+{$i defines.inc}
+
 interface
 
 { $define AnsiStrRef}
@@ -40,11 +40,16 @@ interface
 implementation
 
     uses
+{$ifdef delphi}
+      sysutils,
+{$else}
+      strings,
+{$endif}
       globtype,systems,
       cutils,cobjects,verbose,globals,
       symconst,aasm,types,
 {$ifdef GDB}
-      strings,gdb,
+      gdb,
 {$endif GDB}
       hcodegen,temp_gen,pass_2,
       cpubase,cpuasm,
@@ -1589,7 +1594,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.10  2000-09-19 23:09:07  pierre
+  Revision 1.11  2000-09-24 21:19:48  peter
+    * delphi compile fixes
+
+  Revision 1.10  2000/09/19 23:09:07  pierre
    * problems wih extdebug cond. solved
 
   Revision 1.9  2000/09/16 12:21:56  peter
@@ -1615,4 +1623,4 @@ end.
   Revision 1.2  2000/07/13 11:32:32  michael
   + removed logs
 
-}
+}

compiler/cg386cnv.pas

@@ -20,10 +20,10 @@
 
  ****************************************************************************
 }
-{$ifdef TP}
-  {$E+,F+,N+,D+,L+,Y+}
-{$endif}
 unit cg386cnv;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1568,7 +1568,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2000-08-29 18:31:32  peter
+  Revision 1.7  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/08/29 18:31:32  peter
     * string to chararray with stringconst only supports shortstring, don't
       use the trick for ansistring (merged)
 
@@ -1589,4 +1592,4 @@ end.
   Revision 1.2  2000/07/13 11:32:33  michael
   + removed logs
 
-}
+}

compiler/cg386con.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit cg386con;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -458,10 +461,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  2000-08-16 13:06:06  florian
+  Revision 1.4  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.3  2000/08/16 13:06:06  florian
     + support of 64 bit integer constants
 
   Revision 1.2  2000/07/13 11:32:33  michael
   + removed logs
 
-}
+}

compiler/cg386flw.pas

@@ -20,10 +20,10 @@
 
  ****************************************************************************
 }
-{$ifdef FPC}
-  {$goto on}
-{$endif FPC}
 unit cg386flw;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1237,7 +1237,10 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.5  2000-08-29 18:41:02  peter
+  Revision 1.6  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.5  2000/08/29 18:41:02  peter
     * push ebp instead of 0 for raise without address
 
   Revision 1.4  2000/08/13 08:41:07  peter

compiler/cg386inl.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit cg386inl;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1537,7 +1540,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.8  2000-09-24 15:06:11  peter
+  Revision 1.9  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.8  2000/09/24 15:06:11  peter
     * use defines.inc
 
   Revision 1.7  2000/08/27 16:11:49  peter

compiler/cg386ld.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit cg386ld;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1008,7 +1011,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  2000-08-27 16:11:49  peter
+  Revision 1.6  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.5  2000/08/27 16:11:49  peter
     * moved some util functions from globals,cobjects to cutils
     * splitted files into finput,fmodule
 
@@ -1021,4 +1027,4 @@ end.
   Revision 1.2  2000/07/13 11:32:34  michael
   + removed logs
 
-}
+}

compiler/cg386mat.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit cg386mat;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -988,7 +991,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2000-09-18 10:15:48  jonas
+  Revision 1.7  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/09/18 10:15:48  jonas
     * fixed bug in flagsinvers array for unsigned flags (fixed web bug
       1139, not 1135 like I mentioned in the fixes branch) (merged from fixes)
 

compiler/cg386mem.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit cg386mem;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -43,8 +46,13 @@ interface
 implementation
 
     uses
+{$ifdef delphi}
+      sysutils,
+{$else}
+      strings,
+{$endif}
 {$ifdef GDB}
-      strings,gdb,
+      gdb,
 {$endif GDB}
       globtype,systems,
       cutils,cobjects,verbose,globals,
@@ -958,7 +966,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2000-08-27 16:11:49  peter
+  Revision 1.7  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/08/27 16:11:49  peter
     * moved some util functions from globals,cobjects to cutils
     * splitted files into finput,fmodule
 
@@ -977,4 +988,4 @@ end.
   Revision 1.2  2000/07/13 11:32:35  michael
   + removed logs
 
-}
+}

compiler/cg386set.pas

@@ -21,6 +21,13 @@
  ****************************************************************************
 }
 unit cg386set;
+
+{$i defines.inc}
+
+{$ifdef delphi}
+  {$O-}
+{$endif}
+
 interface
 
     uses
@@ -1052,7 +1059,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2000-08-12 06:47:56  florian
+  Revision 1.7  2000-09-24 21:19:49  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/08/12 06:47:56  florian
     + case statement for int64/qword implemented
 
   Revision 1.5  2000/08/05 09:57:27  jonas
@@ -1072,4 +1082,4 @@ end.
   Revision 1.2  2000/07/13 11:32:35  michael
   + removed logs
 
-}
+}

compiler/cobjects.pas

@@ -329,8 +329,10 @@ implementation
       end;
 
     procedure tmemdebug.show;
+{$ifndef Delphi}
       var
         l : longint;
+{$endif}
       begin
 {$ifndef Delphi}
         write('memory [',infostr,'] ');
@@ -1841,7 +1843,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.13  2000-09-24 15:06:12  peter
+  Revision 1.14  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.13  2000/09/24 15:06:12  peter
     * use defines.inc
 
   Revision 1.12  2000/08/27 20:19:38  peter

compiler/daopt386.pas

@@ -219,7 +219,7 @@ Var
 Implementation
 
 Uses
-  globals, systems, strings, verbose, hcodegen, symconst, tgeni386;
+  globals, systems, verbose, hcodegen, symconst, tgeni386;
 
 Type
   TRefCompare = function(const r1, r2: TReference): Boolean;
@@ -2338,7 +2338,10 @@ End.
 
 {
   $Log$
-  Revision 1.11  2000-09-24 15:06:15  peter
+  Revision 1.12  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.11  2000/09/24 15:06:15  peter
     * use defines.inc
 
   Revision 1.10  2000/09/22 15:00:20  jonas

compiler/defines.inc

@@ -1,25 +1,26 @@
 {$ifdef FPC}
-  {$mode objfpc}
-  {$H-}
-  {$goto on}
+  {$ifdef DELPHI}
+    {$mode delphi}
+    {$asmmode intel}
+  {$else}
+    {$mode objfpc}
+    {$H-}
+    {$goto on}
 
-  { Packing of enumerated types to save space }
-  {$ifdef FPC}
     {$ifdef PACKENUMFIXED}
       {$PACKENUM 1}
     {$endif}
-  {$endif}
 
-  {$define FPCPROCVAR}
-  {$ifdef I386}
-    {$define USEEXCEPT}
+    {$define FPCPROCVAR}
+    {$ifdef I386}
+      {$define USEEXCEPT}
+    {$endif}
   {$endif}
 {$endif}
 
 {$ifdef DELPHI}
   {$H-}
 
-  { Packing of enumerated types to save space }
   {$Z1}
 
   {$undef FPCPROCVAR}

compiler/dmisc.pas

@@ -253,9 +253,9 @@ end;
 
    function GetVersion : longint;stdcall;
      external 'Kernel32.dll' name 'GetVersion';
-   procedure GetLocalTime(var t : TSystemTime);stdcall;
+   procedure GetLocalTime(var t : Windows.TSystemTime);stdcall;
      external 'Kernel32.dll' name 'GetLocalTime';
-   function SetLocalTime(const t : TSystemTime) : boolean;stdcall;
+   function SetLocalTime(const t : Windows.TSystemTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'SetLocalTime';
 
 function dosversion : word;
@@ -266,7 +266,7 @@ end;
 
 procedure getdate(var year,month,mday,wday : word);
 var
-  t : TSystemTime;
+  t : Windows.TSystemTime;
 begin
   GetLocalTime(t);
   year:=t.wYear;
@@ -278,7 +278,7 @@ end;
 
 procedure setdate(year,month,day : word);
 var
-  t : TSystemTime;
+  t : Windows.TSystemTime;
 begin
   { we need the time set privilege   }
   { so this function crash currently }
@@ -294,7 +294,7 @@ end;
 
 procedure gettime(var hour,minute,second,sec100 : word);
 var
-  t : TSystemTime;
+  t : Windows.TSystemTime;
 begin
    GetLocalTime(t);
    hour:=t.wHour;
@@ -306,7 +306,7 @@ end;
 
 procedure settime(hour,minute,second,sec100 : word);
 var
-   t : TSystemTime;
+   t : Windows.TSystemTime;
 begin
    { we need the time set privilege   }
    { so this function crash currently }
@@ -471,7 +471,7 @@ end;
 ******************************************************************************}
 
 { Needed kernel calls }
-   function FindFirstFile (lpFileName: PChar; var lpFindFileData: TWIN32FindData): THandle;stdcall
+   function FindFirstFile (lpFileName: PChar; var lpFindFileData: TWIN32FindData): THandle;stdcall;
      external 'Kernel32.dll' name 'FindFirstFileA';
    function FindNextFile  (hFindFile: THandle; var lpFindFileData: TWIN32FindData): Boolean;stdcall;
      external 'Kernel32.dll' name 'FindNextFileA';
@@ -872,7 +872,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.3  2000-09-24 15:06:15  peter
+  Revision 1.4  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.3  2000/09/24 15:06:15  peter
     * use defines.inc
 
   Revision 1.2  2000/07/13 11:32:40  michael

compiler/globals.pas

@@ -1008,7 +1008,9 @@ implementation
      var
        hs1 : namestr;
        hs2 : extstr;
+{$ifdef need_path_search}
        b   : boolean;
+{$endif}
      begin
 {$ifdef delphi}
        exepath:=dmisc.getenv('PPC_EXEC_PATH');
@@ -1130,7 +1132,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.11  2000-09-24 15:12:40  peter
+  Revision 1.12  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.11  2000/09/24 15:12:40  peter
     * fixed typo
 
   Revision 1.10  2000/09/24 15:06:16  peter

compiler/hcgdata.pas

@@ -53,7 +53,12 @@ interface
 implementation
 
     uses
-       strings,cutils,cobjects,
+{$ifdef delphi}
+       sysutils,
+{$else}
+       strings,
+{$endif}
+       cutils,cobjects,
        globtype,globals,verbose,
        symconst,types,
        hcodegen, systems,fmodule
@@ -745,7 +750,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  2000-09-24 15:06:17  peter
+  Revision 1.6  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.5  2000/09/24 15:06:17  peter
     * use defines.inc
 
   Revision 1.4  2000/08/27 16:11:51  peter

compiler/pdecl.pas

@@ -45,7 +45,7 @@ interface
 
     uses
        cobjects,scanner,
-       cutils,symconst,aasm,tree,pass_1,strings,
+       cutils,symconst,aasm,tree,pass_1,
        fmodule,types,verbose,systems,import,
        cpubase
 {$ifndef newcg}
@@ -1299,7 +1299,10 @@ interface
 end.
 {
   $Log$
-  Revision 1.15  2000-09-24 15:06:21  peter
+  Revision 1.16  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.15  2000/09/24 15:06:21  peter
     * use defines.inc
 
   Revision 1.14  2000/09/11 17:00:23  florian

compiler/pexports.pas

@@ -32,8 +32,13 @@ interface
 implementation
 
     uses
+{$ifdef delphi}
+      sysutils,
+{$else}
+      strings,
+{$endif}
       globtype,systems,tokens,
-      strings,cutils,cobjects,globals,verbose,
+      cutils,cobjects,globals,verbose,
       scanner,symconst,symtable,pbase,
       export,GenDef,tree,pass_1,pexpr;
 
@@ -155,7 +160,10 @@ end.
 
 {
   $Log$
-  Revision 1.4  2000-09-24 15:06:21  peter
+  Revision 1.5  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.4  2000/09/24 15:06:21  peter
     * use defines.inc
 
   Revision 1.3  2000/08/27 16:11:51  peter

compiler/pexpr.pas

@@ -48,6 +48,11 @@ interface
 implementation
 
     uses
+{$ifdef delphi}
+       sysutils,
+{$else}
+       strings,
+{$endif}
        globtype,systems,tokens,
        cutils,cobjects,globals,scanner,
        symconst,aasm,htypechk,
@@ -56,7 +61,7 @@ implementation
 {$else}
        hcodegen,
 {$endif}
-       types,verbose,strings,
+       types,verbose,
 {$ifndef newcg}
    {$ifndef CG11}
        tccal,
@@ -2219,7 +2224,10 @@ _LECKKLAMMER : begin
 end.
 {
   $Log$
-  Revision 1.8  2000-09-24 15:06:22  peter
+  Revision 1.9  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.8  2000/09/24 15:06:22  peter
     * use defines.inc
 
   Revision 1.7  2000/08/27 16:11:51  peter

compiler/pstatmnt.pas

@@ -38,7 +38,7 @@ interface
 
     uses
        globtype,systems,tokens,
-       strings,cutils,cobjects,globals,fmodule,verbose,cpuinfo,
+       cutils,cobjects,globals,fmodule,verbose,cpuinfo,
        symconst,symtable,aasm,pass_1,types,scanner,
 {$ifdef newcg}
        cgbase,
@@ -1375,7 +1375,10 @@ interface
 end.
 {
   $Log$
-  Revision 1.7  2000-09-24 15:06:24  peter
+  Revision 1.8  2000-09-24 21:19:50  peter
+    * delphi compile fixes
+
+  Revision 1.7  2000/09/24 15:06:24  peter
     * use defines.inc
 
   Revision 1.6  2000/08/27 16:11:52  peter

compiler/psub.pas

@@ -52,8 +52,13 @@ function check_identical_proc(var p : pprocdef) : boolean;
 implementation
 
 uses
+{$ifdef delphi}
+  sysutils,
+{$else}
+  strings,
+{$endif}
   globtype,systems,
-  cutils,strings,globals,verbose,fmodule,
+  cutils,globals,verbose,fmodule,
   scanner,aasm,tree,types,
   import,gendef,htypechk,
 {$ifdef newcg}
@@ -2072,7 +2077,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.13  2000-09-24 15:06:24  peter
+  Revision 1.14  2000-09-24 21:19:51  peter
+    * delphi compile fixes
+
+  Revision 1.13  2000/09/24 15:06:24  peter
     * use defines.inc
 
   Revision 1.12  2000/09/10 20:11:07  peter

compiler/ra386att.pas

@@ -36,7 +36,7 @@ Implementation
 
 Uses
   globtype,
-  strings,cutils,cobjects,systems,verbose,globals,
+  cutils,cobjects,systems,verbose,globals,
   fmodule,aasm,types,symconst,symtable,scanner,cpubase,
 {$ifdef NEWCG}
   cgbase,
@@ -2102,7 +2102,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2000-09-24 15:06:26  peter
+  Revision 1.5  2000-09-24 21:19:51  peter
+    * delphi compile fixes
+
+  Revision 1.4  2000/09/24 15:06:26  peter
     * use defines.inc
 
   Revision 1.3  2000/08/27 16:11:52  peter

compiler/ra386int.pas

@@ -36,7 +36,7 @@ Implementation
 
 Uses
   globtype,
-  strings,cutils,cobjects,systems,verbose,globals,
+  cutils,cobjects,systems,verbose,globals,
   fmodule,aasm,types,scanner,symconst,symtable,cpubase,
 {$ifdef NEWCG}
   cgbase,
@@ -1905,7 +1905,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 15:06:26  peter
+  Revision 1.7  2000-09-24 21:19:51  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/09/24 15:06:26  peter
     * use defines.inc
 
   Revision 1.5  2000/08/27 16:11:52  peter

compiler/rautils.pas

@@ -206,7 +206,11 @@ Function SearchIConstant(const s:string; var l:longint): boolean;
 Implementation
 
 uses
+{$ifdef delphi}
+  sysutils,
+{$else}
   strings,
+{$endif}
   types,systems,verbose,globals,fmodule,
   symtable,cpuasm
 {$ifdef NEWCG}
@@ -1538,7 +1542,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  2000-09-24 15:06:26  peter
+  Revision 1.6  2000-09-24 21:19:51  peter
+    * delphi compile fixes
+
+  Revision 1.5  2000/09/24 15:06:26  peter
     * use defines.inc
 
   Revision 1.4  2000/08/27 16:11:52  peter

compiler/symdef.inc

@@ -2509,7 +2509,7 @@
               case hpc^.consttyp of
                 conststring,
                 constresourcestring :
-                  hs:=+strpas(pchar(tpointerord(hpc^.value)));
+                  hs:=strpas(pchar(tpointerord(hpc^.value)));
                 constreal :
                   str(pbestreal(tpointerord(hpc^.value))^,hs);
                 constord,
@@ -4311,7 +4311,10 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.18  2000-09-24 15:06:28  peter
+  Revision 1.19  2000-09-24 21:19:52  peter
+    * delphi compile fixes
+
+  Revision 1.18  2000/09/24 15:06:28  peter
     * use defines.inc
 
   Revision 1.17  2000/09/19 23:08:02  pierre

compiler/symsym.inc

@@ -1690,6 +1690,7 @@
       var
          pd : pbestreal;
          ps : pnormalset;
+         pc : pchar;
          l1,l2 : longint;
 
       begin
@@ -1742,23 +1743,24 @@
            conststring,constresourcestring :
              begin
                len:=readlong;
-               getmem(pchar(tpointerord(value)),len+1);
-               current_ppu^.getdata(pchar(tpointerord(value))^,len);
+               getmem(pc,len+1);
+               current_ppu^.getdata(pc^,len);
                if consttyp=constresourcestring then
                  ResStrIndex:=readlong;
+               value:=tpointerord(pc);
              end;
            constreal :
              begin
                new(pd);
                pd^:=readreal;
-               value:=longint(pd);
+               value:=tpointerord(pd);
              end;
            constset :
              begin
                consttype.load;
                new(ps);
                readnormalset(ps^);
-               value:=longint(ps);
+               value:=tpointerord(ps);
              end;
            constnil : ;
            else
@@ -2216,7 +2218,10 @@
 
 {
   $Log$
-  Revision 1.8  2000-09-19 23:08:03  pierre
+  Revision 1.9  2000-09-24 21:19:52  peter
+    * delphi compile fixes
+
+  Revision 1.8  2000/09/19 23:08:03  pierre
    * fixes for local class debuggging problem (merged)
 
   Revision 1.7  2000/08/27 20:19:39  peter
@@ -2241,4 +2246,4 @@
   Revision 1.2  2000/07/13 11:32:49  michael
   + removed logs
 
-}
+}

compiler/tcadd.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcadd;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1295,7 +1298,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.10  2000-09-21 12:22:17  jonas
+  Revision 1.11  2000-09-24 21:19:52  peter
+    * delphi compile fixes
+
+  Revision 1.10  2000/09/21 12:22:17  jonas
     * put piece of code between -dnewoptimizations2 since it wasn't
       necessary otherwise
 

compiler/tccal.pas

@@ -20,12 +20,10 @@
 
  ****************************************************************************
 }
-{$ifdef FPC}
-  {$goto on}
-{$endif FPC}
-
 unit tccal;
 
+{$i defines.inc}
+
 interface
 
     uses
@@ -1333,7 +1331,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.9  2000-08-27 16:11:54  peter
+  Revision 1.10  2000-09-24 21:19:52  peter
+    * delphi compile fixes
+
+  Revision 1.9  2000/08/27 16:11:54  peter
     * moved some util functions from globals,cobjects to cutils
     * splitted files into finput,fmodule
 

compiler/tccnv.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tccnv;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -1039,7 +1042,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.8  2000-09-24 15:06:31  peter
+  Revision 1.9  2000-09-24 21:19:52  peter
+    * delphi compile fixes
+
+  Revision 1.8  2000/09/24 15:06:31  peter
     * use defines.inc
 
   Revision 1.7  2000/08/27 16:11:55  peter

compiler/tccon.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tccon;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -136,7 +139,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:32:51  michael
+  Revision 1.3  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.2  2000/07/13 11:32:51  michael
   + removed logs
 
 }

compiler/tcflw.pas

@@ -22,6 +22,9 @@
  ****************************************************************************
 }
 unit tcflw;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -637,7 +640,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.8  2000-09-10 21:19:40  peter
+  Revision 1.9  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.8  2000/09/10 21:19:40  peter
     * fixed for counter var check (merged)
 
   Revision 1.7  2000/09/03 11:44:00  peter

compiler/tcinl.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcinl;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -457,8 +460,8 @@ implementation
                          exit;
                        if (p^.left^.resulttype^.deftype=orddef) then
                          if (porddef(p^.left^.resulttype)^.typ in [uchar,uwidechar,bool8bit]) then
-			   case porddef(p^.left^.resulttype)^.typ of
-			    uchar:
+                           case porddef(p^.left^.resulttype)^.typ of
+                            uchar:
                                begin
                                   hp:=gentypeconvnode(p^.left,u8bitdef);
                                   putnode(p);
@@ -466,7 +469,7 @@ implementation
                                   p^.explizit:=true;
                                   firstpass(p);
                                end;
-			    uwidechar:
+                            uwidechar:
                                begin
                                   hp:=gentypeconvnode(p^.left,u16bitdef);
                                   putnode(p);
@@ -474,7 +477,7 @@ implementation
                                   p^.explizit:=true;
                                   firstpass(p);
                                end;
-			    bool8bit:
+                            bool8bit:
                                begin
                                   hp:=gentypeconvnode(p^.left,u8bitdef);
                                   putnode(p);
@@ -482,7 +485,7 @@ implementation
                                   p^.convtyp:=tc_bool_2_int;
                                   p^.explizit:=true;
                                   firstpass(p);
-                    	       end
+                               end
                            end
                          { can this happen ? }
                          else if (porddef(p^.left^.resulttype)^.typ=uvoid) then
@@ -918,8 +921,8 @@ implementation
 
                   while assigned(hp^.right) do
                     hp:=hp^.right;
-                    
-                  if not assigned(hp^.resulttype) then 
+
+                  if not assigned(hp^.resulttype) then
                     exit;
                   { check and convert the first param }
                   if (hp^.is_colon_para) or
@@ -1336,7 +1339,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2000-08-24 13:12:38  jonas
+  Revision 1.7  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.6  2000/08/24 13:12:38  jonas
     * fixed crash when using include/exclude with undeclared variable as
       first parameter (merged from fixes branch)
 
@@ -1353,4 +1359,4 @@ end.
   Revision 1.2  2000/07/13 11:32:52  michael
   + removed logs
 
-}
+}

compiler/tcld.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcld;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -515,7 +518,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  2000-08-27 16:11:55  peter
+  Revision 1.8  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.7  2000/08/27 16:11:55  peter
     * moved some util functions from globals,cobjects to cutils
     * splitted files into finput,fmodule
 
@@ -534,4 +540,4 @@ end.
   Revision 1.2  2000/07/13 11:32:52  michael
   + removed logs
 
-}
+}

compiler/tcmat.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcmat;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -483,7 +486,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.4  2000-08-17 12:03:48  florian
+  Revision 1.5  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.4  2000/08/17 12:03:48  florian
     * fixed several problems with the int64 constants
 
   Revision 1.3  2000/08/16 13:06:07  florian
@@ -492,4 +498,4 @@ end.
   Revision 1.2  2000/07/13 11:32:52  michael
   + removed logs
 
-}
+}

compiler/tcmem.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcmem;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -643,7 +646,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  2000-08-27 16:11:55  peter
+  Revision 1.8  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.7  2000/08/27 16:11:55  peter
     * moved some util functions from globals,cobjects to cutils
     * splitted files into finput,fmodule
 

compiler/tcset.pas

@@ -21,6 +21,9 @@
  ****************************************************************************
 }
 unit tcset;
+
+{$i defines.inc}
+
 interface
 
     uses
@@ -326,10 +329,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  2000-08-12 06:46:26  florian
+  Revision 1.4  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.3  2000/08/12 06:46:26  florian
     + case statement for int64/qword implemented
 
   Revision 1.2  2000/07/13 11:32:52  michael
   + removed logs
 
-}
+}

compiler/tpexcept.pas

@@ -95,9 +95,7 @@ implementation
       ret  0
     end;
 
-{$endif}
-
-{$Ifdef FPC}
+{$else not DELPHI}
 
 {$asmmode ATT}
 
@@ -240,12 +238,15 @@ implementation
          end;
       end;
 
-{$endif FPC}
+{$endif DELPHI}
 
 end.
 {
   $Log$
-  Revision 1.3  2000-09-24 15:06:32  peter
+  Revision 1.4  2000-09-24 21:19:53  peter
+    * delphi compile fixes
+
+  Revision 1.3  2000/09/24 15:06:32  peter
     * use defines.inc
 
   Revision 1.2  2000/07/13 11:32:52  michael