paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 19:09:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Merged revision 319

Browse Source 
git-svn-id: branches/fixes_2_0@320 -
This commit is contained in:
michael 2005-06-09 19:08:46 +00:00
parent bfedc2f54e
commit 23f1eb66d2
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/extra/winunits/activex.pp
View File

@ -1492,7 +1492,6 @@ TYPE
// CURRENCY = CY; // CURRENCY = CY;
{$IFDEF HASINTF}
// Forward interfaces. // Forward interfaces.
@ -2666,7 +2665,6 @@ TYPE
function ContextSensitiveHelp(fEnterMode: BOOL): HResult; stdcall; function ContextSensitiveHelp(fEnterMode: BOOL): HResult; stdcall;
end; end;
{$ENDIF}
tagOleMenuGroupWidths = record tagOleMenuGroupWidths = record
width : array[0..5] Of LONG; width : array[0..5] Of LONG;
@ -2680,7 +2678,6 @@ TYPE
{ ****************************************************************************************************************** { ******************************************************************************************************************
stuff from objbase.h stuff from objbase.h
****************************************************************************************************************** } ****************************************************************************************************************** }
{$IFDEF HASINTF}
{$i wininc/objbase.inc} {$i wininc/objbase.inc}
@ -2693,7 +2690,6 @@ TYPE
function IsEqualIID(const iid1,iid2 : TIID) : Boolean;stdcall;external 'ole32.dll' name 'IsEqualGUID'; 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'; function IsEqualCLSID(const clsid1,clsid2 : TCLSID) : Boolean;stdcall;external 'ole32.dll' name 'IsEqualGUID';
{$ENDIF HASINTF}
const const

12
packages/extra/winunits/jedi.inc
View File

@ -833,12 +833,8 @@
{$DEFINE SUPPORTS_OUTPARAMS} {$DEFINE SUPPORTS_OUTPARAMS}
{$DEFINE SUPPORTS_WIDECHAR} {$DEFINE SUPPORTS_WIDECHAR}
{$DEFINE SUPPORTS_WIDESTRING} {$DEFINE SUPPORTS_WIDESTRING}
{$IFDEF HASINTF} {$DEFINE SUPPORTS_INTERFACE}
{$DEFINE SUPPORTS_INTERFACE} {$DEFINE SUPPORTS_VARIANT}
{$ENDIF}
{$IFDEF HASVARIANT}
{$DEFINE SUPPORTS_VARIANT}
{$ENDIF}
{$IFDEF FPC_HAS_TYPE_SINGLE} {$IFDEF FPC_HAS_TYPE_SINGLE}
{$DEFINE SUPPORTS_SINGLE} {$DEFINE SUPPORTS_SINGLE}
{$ENDIF} {$ENDIF}
@ -848,9 +844,7 @@
{$IFDEF FPC_HAS_TYPE_EXTENDED} {$IFDEF FPC_HAS_TYPE_EXTENDED}
{$DEFINE SUPPORTS_EXTENDED} {$DEFINE SUPPORTS_EXTENDED}
{$ENDIF} {$ENDIF}
{$IFDEF HASCURRENCY} {$DEFINE SUPPORTS_CURRENCY}
{$DEFINE SUPPORTS_CURRENCY}
{$ENDIF}
{$DEFINE SUPPORTS_THREADVAR} {$DEFINE SUPPORTS_THREADVAR}
{$DEFINE SUPPORTS_CONSTPARAMS} {$DEFINE SUPPORTS_CONSTPARAMS}
{$DEFINE SUPPORTS_LONGWORD} {$DEFINE SUPPORTS_LONGWORD}