From 2660e94c5f9c1cbbe143da44b9ed7f3f3e7fd33a Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 6 Nov 2000 21:35:59 +0000 Subject: [PATCH] * removed some warnings --- rtl/i386/rttip.inc | 15 +++++++++------ rtl/inc/dynarr.inc | 9 ++++++--- rtl/inc/objpas.inc | 26 ++++++++++++++++---------- rtl/inc/system.inc | 22 ++++++++++++++-------- rtl/inc/systemh.inc | 7 +++++-- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/rtl/i386/rttip.inc b/rtl/i386/rttip.inc index 0189d0afcb..7adafccad4 100644 --- a/rtl/i386/rttip.inc +++ b/rtl/i386/rttip.inc @@ -89,7 +89,7 @@ asm addl $4,%ebx // push data pushl %eax - call INITIALIZE + call Initialize jmp .LMyRecordInitLoop // Array handling .LDoArrayInit: @@ -117,7 +117,7 @@ asm addl Data,%eax // push data pushl %eax - call INITIALIZE + call Initialize jmp .LMyArrayInitLoop // AnsiString handling : .LDoAnsiStringInit: @@ -165,7 +165,7 @@ asm // Interfaces .LDoInterfaceFinal: pushl Data - call FPC_INTF_DECR_REF + call Intf_Decr_Ref jmp .LExitFinalize // Variants .LDoVariantFinal: @@ -279,7 +279,7 @@ asm // Interfaces .LDoInterfaceAddRef: pushl Data - call FPC_INTF_INCR_REF + call INTF_INCR_REF jmp .LExitAddRef // Variants .LDoVariantAddRef: @@ -393,7 +393,7 @@ asm // Interfaces .LDoInterfaceDecRef: pushl Data - call FPC_INTF_DECR_REF + call INTF_DECR_REF jmp .LExitDecRef // Variants .LDoVariantDecRef: @@ -472,7 +472,10 @@ end; { $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 Revision 1.3 2000/10/21 18:20:17 florian diff --git a/rtl/inc/dynarr.inc b/rtl/inc/dynarr.inc index a01a4b5e3a..bf74e9864c 100644 --- a/rtl/inc/dynarr.inc +++ b/rtl/inc/dynarr.inc @@ -65,7 +65,7 @@ procedure dynarray_setlength(var p : pointer;ti : pdynarraytypeinfo; realp,newp : pdynarray; begin -{!!!!!! +(* !!!!!! realp:=pdynarray(p-sizeof(tdynarray)); if dims[0]<0 then HandleErrorFrame(201,get_frame); @@ -120,7 +120,7 @@ procedure dynarray_setlength(var p : pointer;ti : pdynarraytypeinfo; ti.eletype,dimcount-1,@dims[1]); end; p:=newp+sizeof(tdynarray); -!!!!!!} +!!!!!! *) end; function dynarray_copy(var p : pointer;ti : pdynarraytypeinfo; @@ -132,7 +132,10 @@ function dynarray_copy(var p : pointer;ti : pdynarraytypeinfo; { $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 } diff --git a/rtl/inc/objpas.inc b/rtl/inc/objpas.inc index 21d861c56a..c8ff26637a 100644 --- a/rtl/inc/objpas.inc +++ b/rtl/inc/objpas.inc @@ -14,6 +14,8 @@ **********************************************************************} +Procedure Finalize (Data,TypeInfo: Pointer);forward; + {**************************************************************************** Internal Routines called from the Compiler ****************************************************************************} @@ -34,38 +36,38 @@ {$ifndef HASINTF} { 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 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 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 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 end; {$else HASINTF} { 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 if assigned(i) then IUnknown(i)._Release; i:=nil; 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 if assigned(i) then IUnknown(i)._AddRef; 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 if assigned(S) then IUnknown(S)._AddRef; @@ -74,7 +76,7 @@ D:=S; 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 S_OK = 0; var @@ -88,10 +90,11 @@ D:=tmpi; end else - int_do_intf_decr_ref(D); + intf_decr_ref(D); end; {$endif HASINTF} + {**************************************************************************** TOBJECT ****************************************************************************} @@ -606,7 +609,10 @@ { $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 Revision 1.5 2000/11/04 17:52:46 florian diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc index 5999bdaea8..ec45d9fbdb 100644 --- a/rtl/inc/system.inc +++ b/rtl/inc/system.inc @@ -175,15 +175,24 @@ End; {$i wstrings.inc} {$endif haswidechar} +{***************************************************************************** + Dynamic Array support +*****************************************************************************} + {$i dynarr.inc} +{***************************************************************************** + Object Pascal support +*****************************************************************************} + +{$i objpas.inc} + {**************************************************************************** Run-Time Type Information (RTTI) ****************************************************************************} {$i rtti.inc} - {**************************************************************************** Random function routines @@ -629,15 +638,12 @@ end; {$Q+} {$endif} -{***************************************************************************** - Object Pascal support -*****************************************************************************} - -{$i objpas.inc} - { $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 Revision 1.6 2000/10/13 12:04:03 peter diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index f14fe063ce..6d03ae62af 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -268,7 +268,7 @@ function strlen(p:pchar):longint; { Shortstring functions } {$ifndef INTERNSETLENGTH} -Procedure SetLength (Var S : ShortString; l : longint); +Procedure SetLength (Var S:ShortString;len:StrLenInt); {$endif INTERNSETLENGTH} Function Copy(const s:shortstring;index:StrLenInt;count:StrLenInt):shortstring; Procedure Delete(Var s:shortstring;index:StrLenInt;count:StrLenInt); @@ -484,7 +484,10 @@ const { $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 Revision 1.8 2000/10/23 16:15:40 jonas