diff options
| author | Alexey Kulakov <panda75@bk.ru> | 2012-07-15 06:57:07 +0000 |
|---|---|---|
| committer | Alexey Kulakov <panda75@bk.ru> | 2012-07-15 06:57:07 +0000 |
| commit | 43691e8134fab2a55243607b2047c2fb3f3ee04b (patch) | |
| tree | e9b7d336d85eae7190b800cbd93b261e558a49cc /include/delphi/m_api.pas | |
| parent | dab02845fea8031dd3d7864dc1efc211a434f969 (diff) | |
Delphi7 adaptation
git-svn-id: http://svn.miranda-ng.org/main/trunk@976 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi/m_api.pas')
| -rw-r--r-- | include/delphi/m_api.pas | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas index 9d04c30ff1..df0069a7ff 100644 --- a/include/delphi/m_api.pas +++ b/include/delphi/m_api.pas @@ -24,11 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. {$IFDEF WIN32}{$A4}{$ENDIF}
{$IFDEF WIN64}{$A8}{$ENDIF}
{$ENDIF}
+{$UNDEF AllowInline}
{$IFDEF FPC}
{$DEFINE AllowInline}
{$ELSE}
- {$IFDEF NativeCode} // Delphi.NET+
- {$DEFINE AllowInline}
+ {$IFDEF ConditionalExpressions}
+ {$IF System.ComiplerVersion >= 22.0}
+ {$DEFINE AllowInline}
+ {$IFEND}
{$ENDIF}
{$ENDIF}
@@ -66,6 +69,10 @@ type {$ENDIF}
long = longint;
plong = ^long;
+ {$IFDEF VER150}
+ UnicodeString = WideString;
+ ULONG_PTR = LongWord;
+ {$ENDIF}
DWORD_PTR = ULONG_PTR;
size_t = ULONG_PTR;
{$ENDIF}
|