summaryrefslogtreecommitdiff
path: root/include/m_clistint.h
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-02 19:04:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-02 19:04:21 +0000
commit209e1040e34c50e424a7aa0a7c860c7fc279a76f (patch)
tree96742a262043ca7155d75414ae48b3907f3e2881 /include/m_clistint.h
parent755eaef1f61577c44a9305fb7db3dd25990de52c (diff)
group menu services moved to core
git-svn-id: http://svn.miranda-ng.org/main/trunk@14472 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/m_clistint.h')
-rw-r--r--include/m_clistint.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 4510b963cf..31203835e6 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -239,22 +239,21 @@ typedef struct _menuProto
* CLIST_INTERFACE structure definition
***************************************************************************/
-typedef struct {
+struct ClcProtoStatus
+{
char *szProto;
DWORD dwStatus;
-}
- ClcProtoStatus;
+};
-typedef struct
+struct ClcCacheEntryBase
{
MCONTACT hContact;
TCHAR* tszName;
TCHAR* tszGroup;
int bIsHidden;
-}
- ClcCacheEntryBase;
+};
-typedef struct
+struct CLIST_INTERFACE
{
int version;
@@ -487,18 +486,18 @@ typedef struct
int (*pfnGetAverageMode)(int *pNetProtoCount);
void (*pfnInitAutoRebuild)(HWND hwnd);
void (*pfnSetContactCheckboxes)(ClcContact *cc, int checked);
-}
- CLIST_INTERFACE;
-
-extern CLIST_INTERFACE cli, *pcli;
+};
-// Miranda 0.4.3.0+
// retrieves the pointer to a CLIST_INTERFACE structure
// NOTE: valid only for the clist clone building, not for the regular use
#define MS_CLIST_RETRIEVE_INTERFACE "CList/RetrieveInterface"
-__forceinline void mir_getCLI()
-{ pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, 0);
-}
+#ifndef MIR_APP_EXPORTS
+ extern CLIST_INTERFACE *pcli;
+
+ __forceinline void mir_getCLI()
+ { pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, 0);
+ }
+#endif
#endif // M_CLISTINT_H__