From 6df335227971ee8570528e4470e84d69264eeb3c Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 13 Nov 2009 14:09:50 +0000 Subject: [PATCH] * move constants out of ifndef wince, bug #15057. git-svn-id: trunk@14163 - --- rtl/objpas/types.pp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/rtl/objpas/types.pp b/rtl/objpas/types.pp index ae4cc3c390..51243045c4 100644 --- a/rtl/objpas/types.pp +++ b/rtl/objpas/types.pp @@ -134,9 +134,6 @@ type const GUID_NULL: TGUID = '{00000000-0000-0000-0000-000000000000}'; -{$ifndef Wince} - // in Wince these are in unit windows. Under 32/64 in ActiveX. - // for now duplicate them. Not that bad for untyped constants. STGTY_STORAGE = 1; STGTY_STREAM = 2; STGTY_LOCKBYTES = 3; @@ -150,6 +147,14 @@ const LOCK_EXCLUSIVE = 2; LOCK_ONLYONCE = 4; + STATFLAG_DEFAULT = 0; + STATFLAG_NONAME = 1; + STATFLAG_NOOPEN = 2; + +{$ifndef Wince} + // in Wince these are in unit windows. Under 32/64 in ActiveX. + // for now duplicate them. Not that bad for untyped constants. + E_FAIL = HRESULT($80004005); E_INVALIDARG = HRESULT($80070057); @@ -195,11 +200,8 @@ const STG_S_BLOCK = $00030201; STG_S_RETRYNOW = $00030202; STG_S_MONITORING = $00030203; - - STATFLAG_DEFAULT = 0; - STATFLAG_NONAME = 1; - STATFLAG_NOOPEN = 2; {$endif} + {$ifndef Windows} type PCLSID = PGUID;