diff options
| author | George Hazan <ghazan@miranda.im> | 2022-05-18 14:57:07 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-05-18 14:57:07 +0300 |
| commit | c532dd787e249378642546173de437bac5a6eed6 (patch) | |
| tree | f559de8901c703a6005679511004ec01fecc90e5 /include/m_types.h | |
| parent | 5ba7647062ed142af980f9f06349c1e27d52fd9b (diff) | |
| parent | 05e766ad3cabf6bb637e647a6396b9637a8c4cb2 (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'include/m_types.h')
| -rw-r--r-- | include/m_types.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/m_types.h b/include/m_types.h index f07427c1b3..1b0bdeb3bf 100644 --- a/include/m_types.h +++ b/include/m_types.h @@ -95,6 +95,8 @@ struct LOGFONTA; struct LOGFONTW; struct WIN32_FIND_DATA; +#define GetCurrentThreadId pthread_self + #define MIR_EXPORT __attribute__((__visibility__("default"))) #define MIR_IMPORT #define MIR_SYSCALL @@ -183,6 +185,12 @@ struct TVINSERTSTRUCT; struct TVSORTCB; struct _TREEITEM; +#ifdef ELEMENTARY_H + typedef Evas_Object* MWindow; +#else + typedef void *MWindow; +#endif + #else /////////////////////////////////////////////////////////////////////////////// // Windows @@ -195,6 +203,8 @@ struct _TREEITEM; #define MIR_SYSCALL __stdcall #define MIR_CDECL __cdecl +typedef HWND MWindow; + #endif #endif // M_TYPES_H__ |