From 86635ba88248c1115ec8ff051eeea28e22a2929a Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 9 Jun 2005 19:05:40 +0000
Subject: [PATCH] + Removed old compiler defines in packages

git-svn-id: trunk@319 -
---
 packages/extra/winunits/activex.pp |  4 ----
 packages/extra/winunits/jedi.inc   | 12 +++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/extra/winunits/activex.pp b/packages/extra/winunits/activex.pp
index 292e89b0a6..48b42ea289 100644
--- a/packages/extra/winunits/activex.pp
+++ b/packages/extra/winunits/activex.pp
@@ -1492,7 +1492,6 @@ TYPE
 
 //  CURRENCY                       = CY;
 
-{$IFDEF HASINTF}
 
 // Forward interfaces.
 
@@ -2666,7 +2665,6 @@ TYPE
     function ContextSensitiveHelp(fEnterMode: BOOL): HResult; stdcall;
   end;
 
-{$ENDIF}
 
   tagOleMenuGroupWidths = record
     width : array[0..5] Of LONG;
@@ -2680,7 +2678,6 @@ TYPE
 { ******************************************************************************************************************
                                                           stuff from objbase.h
   ****************************************************************************************************************** }
-{$IFDEF HASINTF}
 
 {$i wininc/objbase.inc}
 
@@ -2693,7 +2690,6 @@ TYPE
   function IsEqualIID(const iid1,iid2 : TIID) : Boolean;stdcall;external 'ole32.dll' name 'IsEqualGUID';
   function IsEqualCLSID(const clsid1,clsid2 : TCLSID) : Boolean;stdcall;external 'ole32.dll' name 'IsEqualGUID';
 
-{$ENDIF HASINTF}
 
 
 const
diff --git a/packages/extra/winunits/jedi.inc b/packages/extra/winunits/jedi.inc
index 287a04afa2..3d21f31ea5 100644
--- a/packages/extra/winunits/jedi.inc
+++ b/packages/extra/winunits/jedi.inc
@@ -833,12 +833,8 @@
     {$DEFINE SUPPORTS_OUTPARAMS}
     {$DEFINE SUPPORTS_WIDECHAR}
     {$DEFINE SUPPORTS_WIDESTRING}
-    {$IFDEF HASINTF}
-      {$DEFINE SUPPORTS_INTERFACE}
-    {$ENDIF}
-    {$IFDEF HASVARIANT}
-      {$DEFINE SUPPORTS_VARIANT}
-    {$ENDIF}
+    {$DEFINE SUPPORTS_INTERFACE}
+    {$DEFINE SUPPORTS_VARIANT}
     {$IFDEF FPC_HAS_TYPE_SINGLE}
       {$DEFINE SUPPORTS_SINGLE}
     {$ENDIF}
@@ -848,9 +844,7 @@
     {$IFDEF FPC_HAS_TYPE_EXTENDED}
       {$DEFINE SUPPORTS_EXTENDED}
     {$ENDIF}
-    {$IFDEF HASCURRENCY}
-      {$DEFINE SUPPORTS_CURRENCY}
-    {$ENDIF}
+    {$DEFINE SUPPORTS_CURRENCY}
     {$DEFINE SUPPORTS_THREADVAR}
     {$DEFINE SUPPORTS_CONSTPARAMS}
     {$DEFINE SUPPORTS_LONGWORD}