From e521cf5548352e7a443241e10614f97bc9630a2c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 11 Jun 2015 19:06:07 +0000 Subject: - more transparent ProtoServiceExists implementation; - ProtoServiceExists moved from mir_core into miranda32.exe; - miranda32.def is used again to define the order of functions precisely; - libraries updated git-svn-id: http://svn.miranda-ng.org/main/trunk@14118 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_core.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/m_core.h b/include/m_core.h index ad4e1fe3cb..1d5639ed75 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -113,10 +113,8 @@ MIR_CORE_DLL(int) CallFunctionAsync(void (__stdcall *func)(void *), void *ar MIR_CORE_DLL(void) KillModuleServices(HINSTANCE hInst); MIR_CORE_DLL(void) KillObjectServices(void* pObject); -#if defined(_STATIC) -__declspec(dllexport) INT_PTR CallContactService(MCONTACT, const char *, WPARAM, LPARAM); -__declspec(dllexport) INT_PTR CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam); -#else +#if !defined(_STATIC) +MIR_C_CORE_DLL(int) ProtoServiceExists(LPCSTR szModule, const char *szService); MIR_C_CORE_DLL(INT_PTR) CallContactService(MCONTACT, const char *, WPARAM, LPARAM); MIR_C_CORE_DLL(INT_PTR) CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam); #endif @@ -262,11 +260,11 @@ MIR_CORE_DLL(void) List_ObjCopy(SortedList* s, SortedList* d, size_t item MIR_CORE_DLL(HANDLE) mir_createLog(const char *pszName, const TCHAR *ptszDescr, const TCHAR *ptszFile, unsigned options); MIR_CORE_DLL(void) mir_closeLog(HANDLE hLogger); -MIR_C_CORE_DLL(int) mir_writeLogA(HANDLE hLogger, const char *format, ...); -MIR_C_CORE_DLL(int) mir_writeLogW(HANDLE hLogger, const wchar_t *format, ...); +MIR_C_CORE_DLL(int) mir_writeLogA(HANDLE hLogger, const char *format, ...); +MIR_C_CORE_DLL(int) mir_writeLogW(HANDLE hLogger, const wchar_t *format, ...); -MIR_CORE_DLL(int) mir_writeLogVA(HANDLE hLogger, const char *format, va_list args); -MIR_CORE_DLL(int) mir_writeLogVW(HANDLE hLogger, const wchar_t *format, va_list args); +MIR_CORE_DLL(int) mir_writeLogVA(HANDLE hLogger, const char *format, va_list args); +MIR_CORE_DLL(int) mir_writeLogVW(HANDLE hLogger, const wchar_t *format, va_list args); /////////////////////////////////////////////////////////////////////////////// // md5 functions @@ -369,7 +367,6 @@ MIR_CORE_DLL(int) mir_vsnwprintf(wchar_t *buffer, size_t count, const wchar_t struct PROTO_INTERFACE; -MIR_CORE_DLL(int) ProtoServiceExists(LPCSTR szModule, const char *szService); MIR_CORE_DLL(INT_PTR) ProtoBroadcastAck(LPCSTR szModule, MCONTACT hContact, int type, int result, HANDLE hProcess, LPARAM lParam); // Call it in the very beginning of your proto's constructor -- cgit v1.2.3