summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-10 20:26:40 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-10 20:26:40 +0000
commit7193759b046338c6f47ff2edb34743a1465791cd (patch)
treea9096e14c2a31dfdae98ffd1f054cfd79c0020ac
parent518ace0898e5b4a91cb7c3ac7ae680bd8a7e1095 (diff)
switching to MCONTACT in both C++ & Pascal
git-svn-id: http://svn.miranda-ng.org/main/trunk@8085 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--include/delphi/m_core.inc4
-rw-r--r--include/m_core.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 1383fbf9cf..03940fbad9 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -53,9 +53,9 @@ const
DBVTF_VARIABLELENGTH = $80; // ?
type
- HCONTACT = THANDLE;
- THCONTACT = HCONTACT;
MCONTACT = DWORD;
+ HCONTACT = MCONTACT;
+ THCONTACT = HCONTACT;
type
HDBEVENT = THANDLE;
PDBVARIANT = ^TDBVARIANT;
diff --git a/include/m_core.h b/include/m_core.h
index 803185233a..eeb2707664 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -48,9 +48,7 @@ MIR_CORE_DLL(LPCTSTR) CmdLine_GetOption(LPCTSTR ptszParameter);
///////////////////////////////////////////////////////////////////////////////
// database functions
-DECLARE_HANDLE(HCONTACT);
-
-typedef UINT32 MCONTACT;
+typedef UINT32 MCONTACT, HCONTACT;
#define INVALID_CONTACT_ID (MCONTACT(-1))
// DBVARIANT: used by db/contact/getsetting and db/contact/writesetting