mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-16 01:39:27 +02:00
+ Merged revision 319
git-svn-id: branches/fixes_2_0@320 -
This commit is contained in:
parent
bfedc2f54e
commit
23f1eb66d2
@ -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
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user