Browse Source

* removed some warnings

peter 25 years ago
parent
commit
2660e94c5f
5 changed files with 50 additions and 29 deletions
  1. 9 6
      rtl/i386/rttip.inc
  2. 6 3
      rtl/inc/dynarr.inc
  3. 16 10
      rtl/inc/objpas.inc
  4. 14 8
      rtl/inc/system.inc
  5. 5 2
      rtl/inc/systemh.inc

+ 9 - 6
rtl/i386/rttip.inc

@@ -89,7 +89,7 @@ asm
         addl     $4,%ebx
         addl     $4,%ebx
 // push data
 // push data
         pushl    %eax
         pushl    %eax
-        call    INITIALIZE
+        call    Initialize
         jmp     .LMyRecordInitLoop
         jmp     .LMyRecordInitLoop
 // Array handling
 // Array handling
 .LDoArrayInit:
 .LDoArrayInit:
@@ -117,7 +117,7 @@ asm
         addl    Data,%eax
         addl    Data,%eax
 // push data
 // push data
         pushl   %eax
         pushl   %eax
-        call    INITIALIZE
+        call    Initialize
         jmp     .LMyArrayInitLoop
         jmp     .LMyArrayInitLoop
 // AnsiString handling :
 // AnsiString handling :
 .LDoAnsiStringInit:
 .LDoAnsiStringInit:
@@ -165,7 +165,7 @@ asm
         // Interfaces
         // Interfaces
 .LDoInterfaceFinal:
 .LDoInterfaceFinal:
         pushl   Data
         pushl   Data
-        call    FPC_INTF_DECR_REF
+        call    Intf_Decr_Ref
         jmp     .LExitFinalize
         jmp     .LExitFinalize
         // Variants
         // Variants
 .LDoVariantFinal:
 .LDoVariantFinal:
@@ -279,7 +279,7 @@ asm
         // Interfaces
         // Interfaces
 .LDoInterfaceAddRef:
 .LDoInterfaceAddRef:
         pushl   Data
         pushl   Data
-        call    FPC_INTF_INCR_REF
+        call    INTF_INCR_REF
         jmp     .LExitAddRef
         jmp     .LExitAddRef
         // Variants
         // Variants
 .LDoVariantAddRef:
 .LDoVariantAddRef:
@@ -393,7 +393,7 @@ asm
         // Interfaces
         // Interfaces
 .LDoInterfaceDecRef:
 .LDoInterfaceDecRef:
         pushl   Data
         pushl   Data
-        call    FPC_INTF_DECR_REF
+        call    INTF_DECR_REF
         jmp     .LExitDecRef
         jmp     .LExitDecRef
         // Variants
         // Variants
 .LDoVariantDecRef:
 .LDoVariantDecRef:
@@ -472,7 +472,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.4  2000-11-04 16:30:35  florian
+  Revision 1.5  2000-11-06 21:35:59  peter
+    * removed some warnings
+
+  Revision 1.4  2000/11/04 16:30:35  florian
     + interfaces support
     + interfaces support
 
 
   Revision 1.3  2000/10/21 18:20:17  florian
   Revision 1.3  2000/10/21 18:20:17  florian

+ 6 - 3
rtl/inc/dynarr.inc

@@ -65,7 +65,7 @@ procedure dynarray_setlength(var p : pointer;ti : pdynarraytypeinfo;
      realp,newp : pdynarray;
      realp,newp : pdynarray;
 
 
   begin
   begin
-{!!!!!!
+(* !!!!!!
      realp:=pdynarray(p-sizeof(tdynarray));
      realp:=pdynarray(p-sizeof(tdynarray));
      if dims[0]<0 then
      if dims[0]<0 then
        HandleErrorFrame(201,get_frame);
        HandleErrorFrame(201,get_frame);
@@ -120,7 +120,7 @@ procedure dynarray_setlength(var p : pointer;ti : pdynarraytypeinfo;
               ti.eletype,dimcount-1,@dims[1]);
               ti.eletype,dimcount-1,@dims[1]);
        end;
        end;
      p:=newp+sizeof(tdynarray);
      p:=newp+sizeof(tdynarray);
-!!!!!!}
+!!!!!! *)
   end;
   end;
 
 
 function dynarray_copy(var p : pointer;ti : pdynarraytypeinfo;
 function dynarray_copy(var p : pointer;ti : pdynarraytypeinfo;
@@ -132,7 +132,10 @@ function dynarray_copy(var p : pointer;ti : pdynarraytypeinfo;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.1  2000-11-04 17:52:46  florian
+  Revision 1.2  2000-11-06 21:35:59  peter
+    * removed some warnings
+
+  Revision 1.1  2000/11/04 17:52:46  florian
     * fixed linker errors
     * fixed linker errors
 
 
 }
 }

+ 16 - 10
rtl/inc/objpas.inc

@@ -14,6 +14,8 @@
 
 
  **********************************************************************}
  **********************************************************************}
 
 
+Procedure Finalize (Data,TypeInfo: Pointer);forward;
+
 {****************************************************************************
 {****************************************************************************
                   Internal Routines called from the Compiler
                   Internal Routines called from the Compiler
 ****************************************************************************}
 ****************************************************************************}
@@ -34,38 +36,38 @@
 
 
 {$ifndef HASINTF}
 {$ifndef HASINTF}
     { dummies for make cycle with 1.0.x }
     { dummies for make cycle with 1.0.x }
-    procedure int_do_intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
+    procedure intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
       begin
       begin
       end;
       end;
 
 
-    procedure int_do_intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
+    procedure intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
       begin
       begin
       end;
       end;
 
 
-    procedure int_do_intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
+    procedure intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
       begin
       begin
       end;
       end;
 
 
-    procedure int_do_intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
+    procedure intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
       begin
       begin
       end;
       end;
 
 
 {$else HASINTF}
 {$else HASINTF}
     { interface helpers }
     { interface helpers }
-    procedure int_do_intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
+    procedure intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
       begin
       begin
         if assigned(i) then
         if assigned(i) then
           IUnknown(i)._Release;
           IUnknown(i)._Release;
         i:=nil;
         i:=nil;
       end;
       end;
 
 
-    procedure int_do_intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
+    procedure intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
       begin
       begin
          if assigned(i) then
          if assigned(i) then
            IUnknown(i)._AddRef;
            IUnknown(i)._AddRef;
       end;
       end;
 
 
-    procedure int_do_intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
+    procedure intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
       begin
       begin
          if assigned(S) then
          if assigned(S) then
            IUnknown(S)._AddRef;
            IUnknown(S)._AddRef;
@@ -74,7 +76,7 @@
          D:=S;
          D:=S;
       end;
       end;
 
 
-    procedure int_do_intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
+    procedure intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
       const
       const
         S_OK = 0;
         S_OK = 0;
       var
       var
@@ -88,10 +90,11 @@
              D:=tmpi;
              D:=tmpi;
           end
           end
         else
         else
-          int_do_intf_decr_ref(D);
+          intf_decr_ref(D);
       end;
       end;
 {$endif HASINTF}
 {$endif HASINTF}
 
 
+
 {****************************************************************************
 {****************************************************************************
                                TOBJECT
                                TOBJECT
 ****************************************************************************}
 ****************************************************************************}
@@ -606,7 +609,10 @@
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.6  2000-11-06 20:34:24  peter
+  Revision 1.7  2000-11-06 21:35:59  peter
+    * removed some warnings
+
+  Revision 1.6  2000/11/06 20:34:24  peter
     * changed ver1_0 defines to temporary defs
     * changed ver1_0 defines to temporary defs
 
 
   Revision 1.5  2000/11/04 17:52:46  florian
   Revision 1.5  2000/11/04 17:52:46  florian

+ 14 - 8
rtl/inc/system.inc

@@ -175,15 +175,24 @@ End;
 {$i wstrings.inc}
 {$i wstrings.inc}
 {$endif haswidechar}
 {$endif haswidechar}
 
 
+{*****************************************************************************
+                        Dynamic Array support
+*****************************************************************************}
+
 {$i dynarr.inc}
 {$i dynarr.inc}
 
 
+{*****************************************************************************
+                        Object Pascal support
+*****************************************************************************}
+
+{$i objpas.inc}
+
 {****************************************************************************
 {****************************************************************************
                          Run-Time Type Information (RTTI)
                          Run-Time Type Information (RTTI)
 ****************************************************************************}
 ****************************************************************************}
 
 
 {$i rtti.inc}
 {$i rtti.inc}
 
 
-
 {****************************************************************************
 {****************************************************************************
                           Random function routines
                           Random function routines
 
 
@@ -629,15 +638,12 @@ end;
 {$Q+}
 {$Q+}
 {$endif}
 {$endif}
 
 
-{*****************************************************************************
-                        Object Pascal support
-*****************************************************************************}
-
-{$i objpas.inc}
-
 {
 {
   $Log$
   $Log$
-  Revision 1.7  2000-11-04 17:52:46  florian
+  Revision 1.8  2000-11-06 21:35:59  peter
+    * removed some warnings
+
+  Revision 1.7  2000/11/04 17:52:46  florian
     * fixed linker errors
     * fixed linker errors
 
 
   Revision 1.6  2000/10/13 12:04:03  peter
   Revision 1.6  2000/10/13 12:04:03  peter

+ 5 - 2
rtl/inc/systemh.inc

@@ -268,7 +268,7 @@ function strlen(p:pchar):longint;
 
 
 { Shortstring functions }
 { Shortstring functions }
 {$ifndef INTERNSETLENGTH}
 {$ifndef INTERNSETLENGTH}
-Procedure SetLength (Var S : ShortString; l : longint);
+Procedure SetLength (Var S:ShortString;len:StrLenInt);
 {$endif INTERNSETLENGTH}
 {$endif INTERNSETLENGTH}
 Function  Copy(const s:shortstring;index:StrLenInt;count:StrLenInt):shortstring;
 Function  Copy(const s:shortstring;index:StrLenInt;count:StrLenInt):shortstring;
 Procedure Delete(Var s:shortstring;index:StrLenInt;count:StrLenInt);
 Procedure Delete(Var s:shortstring;index:StrLenInt;count:StrLenInt);
@@ -484,7 +484,10 @@ const
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  2000-11-06 20:34:24  peter
+  Revision 1.10  2000-11-06 21:35:59  peter
+    * removed some warnings
+
+  Revision 1.9  2000/11/06 20:34:24  peter
     * changed ver1_0 defines to temporary defs
     * changed ver1_0 defines to temporary defs
 
 
   Revision 1.8  2000/10/23 16:15:40  jonas
   Revision 1.8  2000/10/23 16:15:40  jonas