more fixes for the nextgen compiler.

CryptoLib/src/Asn1/ClpDerOutputStream.pas

@@ -26,12 +26,11 @@ uses
   ClpBits,
   ClpAsn1Tags,
   ClpCryptoLibTypes,
-  ClpIFilterStream,
   ClpIProxiedInterface,
   ClpFilterStream;
 
 type
-  TDerOutputStream = class(TFilterStream, IFilterStream, IDerOutputStream)
+  TDerOutputStream = class(TFilterStream, IDerOutputStream)
 
   strict private
     procedure WriteLength(length: Int32);

CryptoLib/src/Crypto/ClpIESCipher.pas

@@ -139,7 +139,7 @@ begin
 
   &in := Aggregate();
   FBuffer.Clear;
-  FBuffer.SetSize(0);
+  FBuffer.SetSize(Int64(0));
 
   // Convert parameters for use in IESEngine
   params := TIESWithCipherParameters.Create(FIESCipherParameters.GetDerivationV,
@@ -286,7 +286,7 @@ begin
 
   FRandom := Random;
   FBuffer.Clear;
-  FBuffer.SetSize(0);
+  FBuffer.SetSize(Int64(0));
 end;
 
 procedure TIESCipher.ProcessBytes(const input: TCryptoLibByteArray);

CryptoLib/src/Crypto/Signers/ClpSchnorrDigestSigner.pas

@@ -222,7 +222,7 @@ procedure TSchnorrDigestSigner.Reset;
 begin
   FDigest.Reset;
   FBuffer.Clear;
-  FBuffer.SetSize(0);
+  FBuffer.SetSize(Int64(0));
 end;
 
 procedure TSchnorrDigestSigner.Update(input: Byte);

CryptoLib/src/Interfaces/ClpIFilterStream.pas

@@ -28,6 +28,15 @@ type
   IFilterStream = interface(IInterface)
     ['{00DF43F6-55BB-4A90-AEE7-1C6D956E144A}']
 
+    function QueryInterface({$IFDEF FPC}constref {$ELSE}const
+{$ENDIF FPC} IID: TGUID; out Obj): HResult;
+{$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall
+{$ELSE} cdecl {$IFEND};
+    function _AddRef: Integer; {$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall {$ELSE} cdecl
+{$IFEND};
+    function _Release: Integer; {$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall {$ELSE} cdecl
+{$IFEND};
+
     function GetSize: Int64;
     function GetPosition: Int64;
     procedure SetPosition(const Value: Int64);

CryptoLib/src/Utils/IO/ClpFilterStream.pas

@@ -40,12 +40,13 @@ type
     function GetSize: Int64; override;
 
     function QueryInterface({$IFDEF FPC}constref {$ELSE}const
-{$ENDIF FPC} IID: TGUID; out Obj): HResult; {$IFDEF MSWINDOWS} stdcall
-{$ELSE} cdecl {$ENDIF MSWINDOWS};
-    function _AddRef: Integer; {$IFDEF MSWINDOWS} stdcall {$ELSE} cdecl
-{$ENDIF MSWINDOWS};
-    function _Release: Integer; {$IFDEF MSWINDOWS} stdcall {$ELSE} cdecl
-{$ENDIF MSWINDOWS};
+{$ENDIF FPC} IID: TGUID; out Obj): HResult;
+{$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall
+{$ELSE} cdecl {$IFEND};
+    function _AddRef: Integer; {$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall {$ELSE} cdecl
+{$IFEND};
+    function _Release: Integer; {$IF DEFINED(MSWINDOWS) OR DEFINED(DELPHI)} stdcall {$ELSE} cdecl
+{$IFEND};
 
   public
     constructor Create(const s: TStream);
@@ -70,6 +71,25 @@ uses
 
 { TFilterStream }
 
+function TFilterStream._AddRef: Integer;
+begin
+  Result := -1;
+end;
+
+function TFilterStream._Release: Integer;
+begin
+  Result := -1;
+end;
+
+function TFilterStream.QueryInterface({$IFDEF FPC}constref {$ELSE}const
+{$ENDIF FPC} IID: TGUID; out Obj): HResult;
+begin
+  if GetInterface(IID, Obj) then
+    Result := 0
+  else
+    Result := E_NOINTERFACE;
+end;
+
 constructor TFilterStream.Create(const s: TStream);
 begin
   inherited Create();
@@ -96,30 +116,11 @@ begin
   Fs.WriteByte(Value);
 end;
 
-function TFilterStream._AddRef: Integer;
-begin
-  Result := -1;
-end;
-
-function TFilterStream._Release: Integer;
-begin
-  Result := -1;
-end;
-
 function TFilterStream.GetSize: Int64;
 begin
   Result := Fs.Size;
 end;
 
-function TFilterStream.QueryInterface({$IFDEF FPC}constref {$ELSE}const
-{$ENDIF FPC} IID: TGUID; out Obj): HResult;
-begin
-  if GetInterface(IID, Obj) then
-    Result := 0
-  else
-    Result := E_NOINTERFACE;
-end;
-
 function TFilterStream.Read(var Buffer; Count: Int32): Int32;
 begin
   Result := Fs.Read(PByte(Buffer), Count);