+ Removed HASINTF and VER1_0 defines

git-svn-id: trunk@239 -

rtl/bsd/sysos.inc

@@ -58,12 +58,8 @@ begin
   geterrnolocation^:=err;
 end;
 
-{$else}
-{$ifdef ver1_0}
-Var
 {$else}
 threadvar
-{$endif}
       Errno : longint;
 
 function geterrno:longint; [public, alias: 'FPC_SYS_GETERRNO'];

rtl/freebsd/unxsysc.inc

@@ -96,7 +96,7 @@ begin
 end;
 
 // needs oldfpccall;
-Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint; {$ifndef ver1_0} oldfpccall;{$endif}
+Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint;  oldfpccall;
 {
   Sets up a pair of file variables, which act as a pipe. The first one can
   be read from, the second one can be written to.

rtl/inc/cmem.pp

@@ -18,7 +18,6 @@ unit cmem;
 interface
 
 Const
-{$ifndef ver1_0}
 
 {$if defined(win32)}
   LibName = 'msvcrt';
@@ -32,28 +31,6 @@ Const
   LibName = 'c';
 {$endif}
 
-{$else}
-
-{$ifndef win32}
-  {$ifdef netware}
-  LibName = 'clib';
-  {$else}
-    {$ifdef netwlibc}
-    LibName = 'libc';
-    {$else}
-      {$ifdef macos}
-      LibName = 'StdCLib';
-      {$else}
-      LibName = 'c';
-      {$endif macos}
-    {$endif netwlibc}
-  {$endif}
-{$else}
-  LibName = 'msvcrt';
-{$endif}
-
-{$endif}
-
 Function Malloc (Size : ptrint) : Pointer; {$ifdef win32}stdcall{$else}cdecl{$endif}; external LibName name 'malloc';
 Procedure Free (P : pointer); {$ifdef win32}stdcall{$else}cdecl{$endif}; external LibName name 'free';
 function ReAlloc (P : Pointer; Size : ptrint) : pointer; {$ifdef win32}stdcall{$else}cdecl{$endif}; external LibName name 'realloc';

rtl/inc/crth.inc

@@ -56,16 +56,10 @@ var
   CheckEOF: Boolean;      { Enable Ctrl-Z }
   DirectVideo: Boolean;   { Enable direct video addressing }
   CheckSnow: Boolean;     { Enable snow filtering }
-{$ifdef ver1_0}
-const
-{$endif}
   LastMode: Word = 3;         { Current text mode }
   TextAttr: Byte = $07;         { Current text attribute }
   WindMin: Word  = $0;          { Window upper left coordinates }
   WindMax: Word  = $184f;          { Window lower right coordinates }
-{$ifdef ver1_0}
-var
-{$endif}
   { FPC Specific for large screen support }
   WindMinX : DWord;
   WindMaxX : DWord;

rtl/inc/generic.inc

@@ -1172,11 +1172,7 @@ var
      negative := false;
      s:='';
      { Workaround: }
-{$ifdef ver1_0}
-     if (l shr 32=$80000000) and ((l and $ffffffff)=0) then
-{$else}
      if l=int64($8000000000000000) then
-{$endif}
        begin
          s:='-9223372036854775808';
          exit;

rtl/inc/objpas.inc

@@ -33,30 +33,6 @@
          result := aobject;
       end;
 
-{$ifndef HASINTF}
-    { dummies for make cycle with 1.0.x }
-    procedure fpc_intf_decr_ref(var i: pointer);{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}[public,alias: 'FPC_INTF_DECR_REF']; {$ifdef hascompilerproc} compilerproc; {$endif}
-      begin
-      end;
-
-    procedure fpc_intf_incr_ref(i: pointer);{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}[public,alias: 'FPC_INTF_INCR_REF']; {$ifdef hascompilerproc} compilerproc; {$endif}
-      begin
-      end;
-
-    procedure fpc_intf_assign(var D: pointer; const S: pointer);[public,alias: 'FPC_INTF_ASSIGN']; {$ifdef hascompilerproc} compilerproc; {$endif}
-      begin
-      end;
-
-    function fpc_intf_as(const S: pointer; const iid: TGUID): pointer;[public,alias: 'FPC_INTF_AS']; {$ifdef hascompilerproc} compilerproc; {$endif}
-      begin
-      end;
-
-    function fpc_class_as_intf(const S: pointer; const iid: TGUID): pointer;[public,alias: 'FPC_CLASS_AS_INTF']; {$ifdef hascompilerproc} compilerproc; {$endif}
-      begin
-      end;
-
-{$else HASINTF}
-
     { interface helpers }
     procedure fpc_intf_decr_ref(var i: pointer);{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}[public,alias: 'FPC_INTF_DECR_REF']; {$ifdef hascompilerproc} compilerproc; {$endif}
       begin
@@ -121,7 +97,6 @@
         else
           fpc_class_as_intf:=nil;
       end;
-{$endif HASINTF}
 
 {****************************************************************************
                                TOBJECT
@@ -153,7 +128,6 @@
 
       procedure InitInterfacePointers(objclass: tclass;instance : pointer);
 
-{$ifdef HASINTF}
         var
            intftable : pinterfacetable;
            i : longint;
@@ -178,10 +152,6 @@
                objclass:=pclass(pointer(objclass)+vmtParent)^;
             end;
         end;
-{$else HASINTF}
-        begin
-        end;
-{$endif HASINTF}
 
       class function TObject.InitInstance(instance : pointer) : tobject;
 
@@ -191,9 +161,7 @@
            { insert VMT pointer into the new created memory area }
            { (in class methods self contains the VMT!)           }
            ppointer(instance)^:=pointer(self);
-{$ifdef HASINTF}
            InitInterfacePointers(self,instance);
-{$endif HASINTF}
            InitInstance:=TObject(Instance);
         end;
 
@@ -596,7 +564,6 @@
         begin
         end;
 
-{$ifdef HASINTF}
       function IsGUIDEqual(const guid1, guid2: tguid): boolean;
         begin
           IsGUIDEqual:=
@@ -749,7 +716,6 @@
          TInterfacedObject(NewInstance).frefcount:=1;
       end;
 
-{$endif HASINTF}
 
 {****************************************************************************
                              Exception Support

rtl/inc/objpash.inc

@@ -150,17 +150,14 @@
           { new for gtk, default handler for text based messages }
           procedure DefaultHandlerStr(var message);virtual;
 
-{$ifdef HASINTF}
           { interface functions }
           function GetInterface(const iid : tguid; out obj) : boolean;
           function GetInterfaceByStr(const iidstr : string; out obj) : boolean;
           class function GetInterfaceEntry(const iid : tguid) : pinterfaceentry;
           class function GetInterfaceEntryByStr(const iidstr : string) : pinterfaceentry;
           class function GetInterfaceTable : pinterfacetable;
-{$endif HASINTF}
        end;
 
-{$ifdef HASINTF}
        IUnknown = interface
          ['{00000000-0000-0000-C000-000000000046}']
          function QueryInterface(const iid : tguid;out obj) : longint;stdcall;
@@ -208,7 +205,6 @@
        PDispatch = ^IDispatch;
        PPDispatch = ^PDispatch;
 
-{$endif HASINTF}
 
        TExceptProc = Procedure (Obj : TObject; Addr : Pointer; FrameCount:Longint; Frame: PPointer);
 

rtl/inc/rtti.inc

@@ -164,13 +164,11 @@ begin
     tkObject,
     tkRecord:
       recordrtti(data,typeinfo,@int_finalize);
-{$ifdef HASINTF}
     tkInterface:
       begin
         Intf_Decr_Ref(PPointer(Data)^);
         PPointer(Data)^:=nil;
       end;
-{$endif HASINTF}
     tkDynArray:
       fpc_dynarray_decr_ref(PPointer(Data)^,TypeInfo);
 {$ifdef HASVARIANT}
@@ -197,10 +195,8 @@ begin
       recordrtti(data,typeinfo,@int_addref);
     tkDynArray:
       fpc_dynarray_incr_ref(PPointer(Data)^);
-{$ifdef HASINTF}
     tkInterface:
       Intf_Incr_Ref(PPointer(Data)^);
-{$endif HASINTF}
 {$ifdef HASVARIANT}
     tkVariant:
       variant_addref(pvardata(Data)^);
@@ -230,10 +226,8 @@ begin
       recordrtti(data,typeinfo,@fpc_systemDecRef);
     tkDynArray:
       fpc_dynarray_decr_ref(PPointer(Data)^,TypeInfo);
-{$ifdef HASINTF}
     tkInterface:
       Intf_Decr_Ref(PPointer(Data)^);
-{$endif HASINTF}
 {$ifdef HASVARIANT}
     tkVariant:
       variant_clear(pvardata(data)^);

rtl/inc/socketsh.inc

@@ -11,12 +11,8 @@
 
  **********************************************************************}
 
-{$IFNDEF ver1_0}
-  {$IFNDEF ver1_9_4}
-    {$INLINE ON}
-    {$define HASINLINE}
-  {$endif}
-{$ENDIF}
+{$INLINE ON}
+{$define HASINLINE}
 
 Type
 {$ifdef SOCK_HAS_SINLEN}

rtl/inc/softfpu.pp

@@ -38,11 +38,9 @@ unit softfpu;
 }
 {$Q-}
 
-{$ifndef ver1_0}
 {$ifdef fpc}
 {$define hascompilerproc}
 {$endif}
-{$endif}
 
 {$ifdef fpc}
 {$goto on}

rtl/inc/sstrings.inc

@@ -378,11 +378,7 @@ end;
 {$ifdef STR_USES_VALINT}
 procedure fpc_shortstr_UInt(v : valUInt;len : SizeInt;var s : shortstring);[public,alias:'FPC_SHORTSTR_UINT']; {$ifdef hascompilerproc} compilerproc; {$endif}
 {$else}
-  {$ifdef ver1_0}
-  procedure fpc_shortstr_cardinal(v : longword;len : SizeInt;var s : shortstring);[public,alias:'FPC_SHORTSTR_CARDINAL']; {$ifdef hascompilerproc} compilerproc; {$endif}
-  {$else}
   procedure fpc_shortstr_longword(v : longword;len : SizeInt;var s : shortstring);[public,alias:'FPC_SHORTSTR_LONGWORD']; {$ifdef hascompilerproc} compilerproc; {$endif}
-  {$endif}
 {$endif}
 begin
   int_str(v,s);

rtl/linux/sysos.inc

@@ -37,11 +37,7 @@ end;
 
 {$else}
 
-{$ifdef ver1_0}
-Var
-{$else}
 ThreadVar
-{$endif}
   Errno : longint;
 
 function geterrno:longint; [public, alias: 'FPC_SYS_GETERRNO'];

rtl/netbsd/classes.pp

@@ -46,8 +46,6 @@ initialization
 finalization
   CommonCleanup;
 
-{$ifndef ver1_0}
   if ThreadsInited then
      DoneThreads;
-{$endif}
 end.

rtl/netbsd/unixsysc.inc

@@ -97,7 +97,7 @@ begin
 end;
 
 // needs oldfpccall;
-Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint; {$ifndef ver1_0} oldfpccall;{$endif}
+Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint; oldfpccall;
 {
   Sets up a pair of file variables, which act as a pipe. The first one can
   be read from, the second one can be written to.
@@ -218,7 +218,7 @@ end;
 
 
 {
-function  intClone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint; {$ifndef ver1_0} oldfpccall; {$endif}
+function  intClone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint;  oldfpccall;
 
 
 var lerrno : Longint;

rtl/objpas/classes/compon.inc

@@ -567,7 +567,6 @@ begin
     Result := False;
 end;
 
-{$ifdef HASINTF}
 function TComponent.QueryInterface(const IID: TGUID; out Obj): HResult;stdcall;
 begin
   if GetInterface(IID, Obj) then
@@ -586,5 +585,4 @@ begin
   result:=-1;
 end;
 
-{$endif HASINTF}
 

rtl/objpas/classes/persist.inc

@@ -84,7 +84,6 @@ end;
 {*                          TInterfacedPersistent                           *}
 {****************************************************************************}
 
-{$ifdef HASINTF}
 procedure TInterfacedPersistent.AfterConstruction;
 begin
   inherited;
@@ -118,7 +117,6 @@ begin
   else
     Result:=HResult($80004002);
 end;
-{$endif HASINTF}
 
 
 {****************************************************************************}

rtl/objpas/objpas.pp

@@ -38,9 +38,7 @@ unit objpas;
        PointerArray  = array [0..512*1024*1024-2] of Pointer;
        TPointerArray = PointerArray;
        PPointerArray = ^PointerArray;
-{$ifdef HASINTF}
        TBoundArray = array of integer;
-{$endif HASINTF}
 
 {****************************************************************************
                              Compatibility routines.

rtl/objpas/strutils.pp

@@ -68,12 +68,10 @@ Function MidBStr(const AText: AnsiString; const AByteStart, AByteCount: Integer)
 Function AnsiLeftStr(const AText: AnsiString; const ACount: Integer): AnsiString;
 Function AnsiRightStr(const AText: AnsiString; const ACount: Integer): AnsiString;
 Function AnsiMidStr(const AText: AnsiString; const AStart, ACount: Integer): AnsiString;
-{$ifndef ver1_0}
 Function LeftBStr(const AText: AnsiString; const AByteCount: Integer): AnsiString;
 Function LeftStr(const AText: WideString; const ACount: Integer): WideString;
 Function RightStr(const AText: WideString; const ACount: Integer): WideString;
 Function MidStr(const AText: WideString; const AStart, ACount: Integer): WideString;
-{$endif}
 
 { ---------------------------------------------------------------------
     Extended search and replace
@@ -487,7 +485,6 @@ begin
   Result:=Copy(AText,AStart,ACount);
 end;
 
-{$ifndef ver1_0}
 Function LeftStr(const AText: WideString; const ACount: Integer): WideString;
 
 begin
@@ -515,7 +512,6 @@ Function MidStr(const AText: WideString; const AStart, ACount: Integer): WideStr
 begin
   Result:=Copy(AText,AStart,ACount);
 end;
-{$endif}
 
 
 

rtl/objpas/sysutils/systhrdh.inc

@@ -11,7 +11,6 @@
 
  **********************************************************************}
 
-{$ifdef HASINTF}
 
 type
    IReadWriteSync = interface
@@ -22,7 +21,6 @@ type
      procedure EndWrite;
    end;
 
-{$endif HASINTF}
 
 function InterLockedIncrement (var Target: longint) : longint;
 function InterLockedDecrement (var Target: longint) : longint;

rtl/objpas/sysutils/sysutilh.inc

@@ -231,8 +231,6 @@ Type
 
   procedure FreeAndNil(var obj);
 
-{$ifdef HASINTF}
   { interface handling }
   {$i intfh.inc}
-{$endif HASINTF}
 

rtl/objpas/sysutils/sysutils.inc

@@ -87,10 +87,8 @@
         temp.free;
       end;
 
-{$ifdef HASINTF}
   { Interfaces support }
   {$i sysuintf.inc}
-{$endif HASINTF}
 
     constructor Exception.Create(const msg : string);
 

rtl/objpas/types.pp

@@ -21,7 +21,6 @@ unit types;
        Windows;
 {$endif Win32}
 
-{$ifndef ver1_0}
 const
   RT_RCDATA = PChar(10);
 
@@ -228,7 +227,6 @@ type
   STATSTG = TStatStg;
   PStatStg = ^TStatStg;
 
-{$ifdef HASINTF}
   IClassFactory = Interface(IUnknown) ['{00000001-0000-0000-C000-000000000046}']
      Function CreateInstance(Const unkOuter : IUnknown;Const riid : TGUID;Out vObject) : HResult;StdCall;
      Function LockServer(fLock : LongBool) : HResult;StdCall;
@@ -254,7 +252,6 @@ type
      Function Stat(out statstg : TStatStg;grfStatFlag : Longint) : HRESULT;stdcall;
      function Clone(out stm : IStream) : HRESULT;stdcall;
   end;
-{$endif HASINTF}
 {$endif win32}
 
 function EqualRect(const r1,r2 : TRect) : Boolean;
@@ -268,11 +265,8 @@ function IsRectEmpty(const Rect : TRect) : Boolean;
 function OffsetRect(var Rect : TRect;DX : Integer;DY : Integer) : Boolean;
 function CenterPoint(const Rect: TRect): TPoint;
 
-{$endif ver1_0}
-
 implementation
 
-{$ifndef ver1_0}
 
 function EqualRect(const r1,r2 : TRect) : Boolean;
 
@@ -398,6 +392,5 @@ begin
 end;
 
 
-{$endif ver1_0}
 
 end.

rtl/objpas/typinfo.pp

@@ -190,13 +190,8 @@ Function GetPropInfo(AClass: TClass; const PropName: string): PPropInfo;
 Function FindPropInfo(Instance: TObject; const PropName: string): PPropInfo;
 Function FindPropInfo(AClass:TClass;const PropName: string): PPropInfo;
 Procedure GetPropInfos(TypeInfo : PTypeInfo;PropList : PPropList);
-{$ifdef ver1_0}
-Function  GetPropList(TypeInfo : PTypeInfo;TypeKinds : TTypeKinds; PropList : PPropList;Sorted : boolean):longint;
-Function GetPropList(TypeInfo: PTypeInfo; var PropList: PPropList): SizeInt;
-{$else}
 Function  GetPropList(TypeInfo : PTypeInfo;TypeKinds : TTypeKinds; PropList : PPropList;Sorted : boolean = true):longint;
 Function GetPropList(TypeInfo: PTypeInfo; out PropList: PPropList): SizeInt;
-{$endif}
 
 
 // Property information routines.
@@ -608,11 +603,7 @@ Type TInsertProp = Procedure (PL : PProplist;PI : PPropInfo; Count : longint);
 
 //Const InsertProps : array[false..boolean] of TInsertProp = (InsertPropNoSort,InsertProp);
 
-{$ifdef ver1_0}
-Function  GetPropList(TypeInfo : PTypeInfo;TypeKinds : TTypeKinds; PropList : PPropList;Sorted : boolean):longint;
-{$else}
 Function  GetPropList(TypeInfo : PTypeInfo;TypeKinds : TTypeKinds; PropList : PPropList;Sorted : boolean = true):longint;
-{$endif}
 
 {
   Store Pointers to property information OF A CERTAIN KIND in the list pointed
@@ -654,11 +645,7 @@ begin
 end;
 
 
-{$ifdef ver1_0}
-Function GetPropList(TypeInfo: PTypeInfo; var PropList: PPropList): SizeInt;
-{$else}
 Function GetPropList(TypeInfo: PTypeInfo; out PropList: PPropList): SizeInt;
-{$endif}
   begin
     result:=GetTypeData(TypeInfo)^.Propcount;
     if result>0 then

rtl/openbsd/classes.pp

@@ -46,8 +46,6 @@ initialization
 finalization
   CommonCleanup;
 
-{$ifndef ver1_0}
   if ThreadsInited then
      DoneThreads;
-{$endif}
 end.

rtl/openbsd/unixsysc.inc

@@ -97,7 +97,7 @@ begin
 end;
 
 // needs oldfpccall;
-Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint; {$ifndef ver1_0} oldfpccall;{$endif}
+Function intAssignPipe(var pipe_in,pipe_out:longint;var errn:cint):cint; oldfpccall;
 {
   Sets up a pair of file variables, which act as a pipe. The first one can
   be read from, the second one can be written to.
@@ -218,7 +218,7 @@ end;
 
 
 {
-function  intClone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint; {$ifndef ver1_0} oldfpccall; {$endif}
+function  intClone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint;  oldfpccall;
 
 
 var lerrno : Longint;

rtl/unix/baseunix.pp

@@ -38,14 +38,9 @@ Uses UnixType;
   {$i bunxh.inc}                { Functions}
 {$ENDIF}
 
-{$ifndef ver1_0}
   function fpgeterrno:longint; external name 'FPC_SYS_GETERRNO';
   procedure fpseterrno(err:longint); external name 'FPC_SYS_SETERRNO';
   property errno : cint read fpgeterrno write fpseterrno;
-{$else}
-  function fpgeterrno:longint;
-  procedure fpseterrno(err:longint);
-{$endif}
 
 {$i bunxovlh.inc}
 
@@ -56,23 +51,6 @@ implementation
 Uses Sysctl;
 {$endif}
 
-{$ifdef ver1_0}
-// workaround for 1.0.10 bugs.
-
-function intgeterrno:longint; external name 'FPC_SYS_GETERRNO';
-procedure intseterrno(err:longint); external name 'FPC_SYS_SETERRNO';
-
-function fpgeterrno:longint;
-begin
-  fpgeterrno:=intgeterrno;
-end;
-
-procedure fpseterrno(err:longint);
-begin
-  intseterrno(err);
-end;
-
-{$endif}
 
 {$i genfuncs.inc}       // generic calls. (like getenv)
 {$I gensigset.inc}     // general sigset funcs implementation.

rtl/unix/cthreads.pp

@@ -122,11 +122,7 @@ Type  PINTRTLEvent = ^TINTRTLEvent;
 
     procedure CReleaseThreadVars;
       begin
-        {$ifdef ver1_0}
-        Fpmunmap(longint(pthread_getspecific(tlskey)),threadvarblocksize);
-        {$else}
         Fpmunmap(pointer(pthread_getspecific(tlskey)),threadvarblocksize);
-        {$endif}
       end;
 
 { Include OS independent Threadvar initialization }

rtl/unix/unix.pp

@@ -26,7 +26,7 @@ Uses BaseUnix,UnixType;
 // keep the code working.
 
 var
-  Tzseconds : Longint {$ifndef ver1_0} = 0 {$endif};
+  Tzseconds : Longint = 0;
 
 
 {********************
@@ -483,7 +483,7 @@ begin { Changes as above }
   fpsigaction(SIGQUIT, @ign, @quitact);
   fpsigemptyset(newsigblock);
   fpsigaddset(newsigblock,SIGCHLD);
-  fpsigprocmask(SIG_BLOCK,{$ifdef ver1_0}@{$endif}newsigblock,{$ifdef ver1_0}@{$endif}oldsigblock);
+  fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock);
   pid:=fpfork;
   if pid=0 then // We are in the Child
    begin

rtl/win32/initc.pp

@@ -11,9 +11,7 @@ type
 function fpgetCerrno:libcint;
 procedure fpsetCerrno(err:libcint);
 
-{$ifndef ver1_0}
 property cerrno:libcint read fpgetCerrno write fpsetcerrno;
-{$endif}
 
 
 implementation

rtl/win32/keyboard.pp

@@ -56,7 +56,7 @@ var
    { used for keyboard specific stuff }
    KeyBoardLayout : HKL;
    Inited : Boolean;
-   HasAltGr  : Boolean{$ifndef ver1_0} = false {$endif};
+   HasAltGr  : Boolean = false;
 
 
 

rtl/win32/wininc/redef.inc

@@ -243,11 +243,7 @@ function CallMsgFilterW(var lpMsg: TMsg; nCode: Integer): BOOL; external 'user32
 function CallNamedPipe(lpNamedPipeName: PChar; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL;external 'kernel32' name 'CallNamedPipeA';
 function CallNamedPipeA(lpNamedPipeName: LPCSTR; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL; external 'kernel32' name 'CallNamedPipeA';
 function CallNamedPipeW(lpNamedPipeName: LPWSTR; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL; external 'kernel32' name 'CallNamedPipeW';
-{$ifdef ver1_0}
-  function CoRegisterClassObject(const _para1:TCLSID; _para2:Pointer; _para3:DWORD; _para4:DWORD; var _para5:DWORD):HRESULT;external 'ole32.dll' name 'CoRegisterClassObject';
-{$else}
-  function CoRegisterClassObject(const _para1:TCLSID; _para2:IUnknown; _para3:DWORD; _para4:DWORD; out_para5:DWORD):HRESULT;external 'ole32.dll' name 'CoRegisterClassObject';
-{$endif}
+function CoRegisterClassObject(const _para1:TCLSID; _para2:IUnknown; _para3:DWORD; _para4:DWORD; out_para5:DWORD):HRESULT;external 'ole32.dll' name 'CoRegisterClassObject';
 function ChangeDisplaySettings(var lpDevMode: TDeviceMode; dwFlags: DWORD): Longint;external 'user32' name 'ChangeDisplaySettingsA';
 function ChangeDisplaySettingsA(var lpDevMode: TDeviceModeA; dwFlags: DWORD): Longint; external 'user32' name 'ChangeDisplaySettingsA';
 {$ifdef support_smartlink}