Browse Source

* another fix for interfaces

florian 25 years ago
parent
commit
49881f1aec
2 changed files with 20 additions and 14 deletions
  1. 8 5
      rtl/i386/rttip.inc
  2. 12 9
      rtl/inc/objpas.inc

+ 8 - 5
rtl/i386/rttip.inc

@@ -165,7 +165,7 @@ asm
         // Interfaces
         // Interfaces
 .LDoInterfaceFinal:
 .LDoInterfaceFinal:
         pushl   Data
         pushl   Data
-        call    Intf_Decr_Ref
+        call    Int_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    INTF_INCR_REF
+        call    INT_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    INTF_DECR_REF
+        call    INT_INTF_DECR_REF
         jmp     .LExitDecRef
         jmp     .LExitDecRef
         // Variants
         // Variants
 .LDoVariantDecRef:
 .LDoVariantDecRef:
@@ -472,7 +472,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2000-11-06 21:35:59  peter
+  Revision 1.6  2000-11-06 21:52:21  florian
+    * another fix for interfaces
+
+  Revision 1.5  2000/11/06 21:35:59  peter
     * removed some warnings
     * removed some warnings
 
 
   Revision 1.4  2000/11/04 16:30:35  florian
   Revision 1.4  2000/11/04 16:30:35  florian
@@ -486,4 +489,4 @@ end;
 
 
   Revision 1.2  2000/07/13 11:33:41  michael
   Revision 1.2  2000/07/13 11:33:41  michael
   + removed logs
   + removed logs
-}
+}

+ 12 - 9
rtl/inc/objpas.inc

@@ -36,38 +36,38 @@ Procedure Finalize (Data,TypeInfo: Pointer);forward;
 
 
 {$ifndef HASINTF}
 {$ifndef HASINTF}
     { dummies for make cycle with 1.0.x }
     { dummies for make cycle with 1.0.x }
-    procedure intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
+    procedure int_intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
       begin
       begin
       end;
       end;
 
 
-    procedure intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
+    procedure int_intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
       begin
       begin
       end;
       end;
 
 
-    procedure intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
+    procedure int_intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
       begin
       begin
       end;
       end;
 
 
-    procedure intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
+    procedure int_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 intf_decr_ref(var i: pointer);[public,alias: 'FPC_INTF_DECR_REF'];
+    procedure int_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 intf_incr_ref(const i: pointer);[public,alias: 'FPC_INTF_INCR_REF'];
+    procedure int_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 intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN'];
+    procedure int_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;
@@ -76,7 +76,7 @@ Procedure Finalize (Data,TypeInfo: Pointer);forward;
          D:=S;
          D:=S;
       end;
       end;
 
 
-    procedure intf_as(var D: pointer; const S: pointer; const iid: TGUID);[public,alias: 'FPC_INTF_AS'];
+    procedure int_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
@@ -609,7 +609,10 @@ Procedure Finalize (Data,TypeInfo: Pointer);forward;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.7  2000-11-06 21:35:59  peter
+  Revision 1.8  2000-11-06 21:53:38  florian
+    * another fix for interfaces
+
+  Revision 1.7  2000/11/06 21:35:59  peter
     * removed some warnings
     * removed some warnings
 
 
   Revision 1.6  2000/11/06 20:34:24  peter
   Revision 1.6  2000/11/06 20:34:24  peter