From ddd1af0fdf37364c9472faedad941b4cc5f1b465 Mon Sep 17 00:00:00 2001 From: George Hazan <george.hazan@gmail.com> Date: Wed, 27 Jul 2016 11:50:07 +0000 Subject: <tchar.h> removed from <m_system.h> git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_core.h | 10 +++++----- include/m_langpack.h | 6 +++--- include/m_system.h | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/m_core.h b/include/m_core.h index dfbea3077f..8b7e4d80fa 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -98,11 +98,11 @@ MIR_CORE_DLL(int) CallPluginEventHook(HINSTANCE hInst, HANDLE hEvent, WPARAM MIR_CORE_DLL(int) NotifyEventHooks(HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); MIR_CORE_DLL(int) NotifyFastHook(HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); -MIR_CORE_DLL(HANDLE) HookEvent(const char* name, MIRANDAHOOK hookProc); -MIR_CORE_DLL(HANDLE) HookEventParam(const char* name, MIRANDAHOOKPARAM hookProc, LPARAM lParam = 0); -MIR_CORE_DLL(HANDLE) HookEventObj(const char* name, MIRANDAHOOKOBJ hookProc, void* object); -MIR_CORE_DLL(HANDLE) HookEventObjParam(const char* name, MIRANDAHOOKOBJPARAM hookProc, void* object, LPARAM lParam); -MIR_CORE_DLL(HANDLE) HookEventMessage(const char* name, HWND hwnd, UINT message); +MIR_CORE_DLL(HANDLE) HookEvent(const char *name, MIRANDAHOOK hookProc); +MIR_CORE_DLL(HANDLE) HookEventParam(const char *name, MIRANDAHOOKPARAM hookProc, LPARAM lParam = 0); +MIR_CORE_DLL(HANDLE) HookEventObj(const char *name, MIRANDAHOOKOBJ hookProc, void* object); +MIR_CORE_DLL(HANDLE) HookEventObjParam(const char *name, MIRANDAHOOKOBJPARAM hookProc, void* object, LPARAM lParam); +MIR_CORE_DLL(HANDLE) HookEventMessage(const char *name, HWND hwnd, UINT message); MIR_CORE_DLL(int) UnhookEvent(HANDLE hHook); MIR_CORE_DLL(void) KillObjectEventHooks(void* pObject); MIR_CORE_DLL(void) KillModuleEventHooks(HINSTANCE pModule); diff --git a/include/m_langpack.h b/include/m_langpack.h index c158bc89ea..56f8c5b9ce 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -45,8 +45,8 @@ EXTERN_C MIR_CORE_DLL(int) LoadLangPackModule(void); EXTERN_C MIR_CORE_DLL(int) LoadLangPack(const TCHAR *szLangPack); EXTERN_C MIR_CORE_DLL(void) ReloadLangpack(TCHAR *pszStr); -EXTERN_C MIR_CORE_DLL(char*) TranslateA_LP(const char* str, int hLang); -EXTERN_C MIR_CORE_DLL(wchar_t*) TranslateW_LP(const wchar_t* str, int hLang); +EXTERN_C MIR_CORE_DLL(char*) TranslateA_LP(const char *str, int hLang); +EXTERN_C MIR_CORE_DLL(wchar_t*) TranslateW_LP(const wchar_t *str, int hLang); EXTERN_C MIR_CORE_DLL(void) TranslateDialog_LP(HWND hDlg, int hLang); #define Translate(s) TranslateA_LP(s, hLangpack) @@ -97,7 +97,7 @@ EXTERN_C MIR_CORE_DLL(int) Langpack_GetDefaultLocale(void); // returns a string converted from char* to TCHAR* using the langpack codepage. // This string should be freed using mir_free() then -EXTERN_C MIR_CORE_DLL(TCHAR*) Langpack_PcharToTchar(const char* pszStr); +EXTERN_C MIR_CORE_DLL(TCHAR*) Langpack_PcharToTchar(const char *pszStr); ///////////////////////////////////////////////////////////////////////////////////////// // initializes the plugin-specific translation context v0.10.0+ diff --git a/include/m_system.h b/include/m_system.h index da061c8c13..ef0191ce48 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_SYSTEM_H__ #define M_SYSTEM_H__ 1 -#include <tchar.h> - #ifndef MIRANDANAME #define MIRANDANAME "Miranda NG" #endif -- cgit v1.2.3