From ce6e5ab03d58151c4eda36d05a8436d337b2d3c0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Sep 2012 11:48:41 +0000 Subject: removed clutch for GCC (it already exists in m_system.h) git-svn-id: http://svn.miranda-ng.org/main/trunk@1575 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_utils.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/m_utils.h') diff --git a/include/m_utils.h b/include/m_utils.h index ddeb1d2b15..14b2c0d62f 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -140,7 +140,7 @@ typedef struct { HANDLE hContact; } WINDOWLISTENTRY; #define MS_UTILS_ADDTOWINDOWLIST "Utils/AddToWindowList" -__inline static INT_PTR WindowList_Add(HANDLE hList, HWND hwnd, HANDLE hContact) { +__forceinline INT_PTR WindowList_Add(HANDLE hList, HWND hwnd, HANDLE hContact) { WINDOWLISTENTRY wle; wle.hList = hList; wle.hwnd = hwnd; wle.hContact = hContact; return CallService(MS_UTILS_ADDTOWINDOWLIST, 0, (LPARAM)&wle); @@ -150,7 +150,7 @@ __inline static INT_PTR WindowList_Add(HANDLE hList, HWND hwnd, HANDLE hContact) //lParam = (LPARAM)(HWND)hwnd //returns 0 on success, nonzero on failure #define MS_UTILS_REMOVEFROMWINDOWLIST "Utils/RemoveFromWindowList" -__inline static INT_PTR WindowList_Remove(HANDLE hList, HWND hwnd) { +__forceinline INT_PTR WindowList_Remove(HANDLE hList, HWND hwnd) { return CallService(MS_UTILS_REMOVEFROMWINDOWLIST, (WPARAM)hList, (LPARAM)hwnd); } @@ -159,7 +159,7 @@ __inline static INT_PTR WindowList_Remove(HANDLE hList, HWND hwnd) { //lParam = (WPARAM)(HANDLE)hContact //returns the window handle on success, or NULL on failure #define MS_UTILS_FINDWINDOWINLIST "Utils/FindWindowInList" -__inline static HWND WindowList_Find(HANDLE hList, HANDLE hContact) { +__forceinline HWND WindowList_Find(HANDLE hList, HANDLE hContact) { return (HWND)CallService(MS_UTILS_FINDWINDOWINLIST, (WPARAM)hList, (LPARAM)hContact); } @@ -169,7 +169,7 @@ __inline static HWND WindowList_Find(HANDLE hList, HANDLE hContact) { //returns 0 on success, nonzero on failure //Only msg.message, msg.wParam and msg.lParam are used #define MS_UTILS_BROADCASTTOWINDOWLIST "Utils/BroadcastToWindowList" -__inline static INT_PTR WindowList_Broadcast(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) { +__forceinline INT_PTR WindowList_Broadcast(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) { MSG msg; msg.message = message; msg.wParam = wParam; msg.lParam = lParam; return CallService(MS_UTILS_BROADCASTTOWINDOWLIST, (WPARAM)hList, (LPARAM)&msg); @@ -188,7 +188,7 @@ __inline static INT_PTR WindowList_Broadcast(HANDLE hList, UINT message, WPARAM */ #define MS_UTILS_BROADCASTTOWINDOWLIST_ASYNC "Utils/BroadcastToWindowListAsync" -__inline static INT_PTR WindowList_BroadcastAsync(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) { +__forceinline INT_PTR WindowList_BroadcastAsync(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) { MSG msg; msg.message = message; msg.wParam = wParam; msg.lParam = lParam; return CallService(MS_UTILS_BROADCASTTOWINDOWLIST_ASYNC, (WPARAM)hList, (LPARAM)&msg); @@ -223,7 +223,7 @@ typedef struct { const char *szNamePrefix; //text to prefix on "x", "width", etc, to form setting names } SAVEWINDOWPOS; #define MS_UTILS_SAVEWINDOWPOSITION "Utils/SaveWindowPos" -__inline static INT_PTR Utils_SaveWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { +__forceinline INT_PTR Utils_SaveWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { SAVEWINDOWPOS swp; swp.hwnd = hwnd; swp.hContact = hContact; swp.szModule = szModule; swp.szNamePrefix = szNamePrefix; return CallService(MS_UTILS_SAVEWINDOWPOSITION, 0, (LPARAM)&swp); @@ -242,18 +242,18 @@ __inline static INT_PTR Utils_SaveWindowPosition(HWND hwnd, HANDLE hContact, con #define RWPF_NOACTIVATE 4 //show but don't activate v0.3.3.0+ #define RWPF_HIDDEN 8 //make it hidden #define MS_UTILS_RESTOREWINDOWPOSITION "Utils/RestoreWindowPos" -__inline static INT_PTR Utils_RestoreWindowPositionEx(HWND hwnd, int flags, HANDLE hContact, const char *szModule, const char *szNamePrefix) { +__forceinline INT_PTR Utils_RestoreWindowPositionEx(HWND hwnd, int flags, HANDLE hContact, const char *szModule, const char *szNamePrefix) { SAVEWINDOWPOS swp; swp.hwnd = hwnd; swp.hContact = hContact; swp.szModule = szModule; swp.szNamePrefix = szNamePrefix; return CallService(MS_UTILS_RESTOREWINDOWPOSITION, flags, (LPARAM)&swp); } -__inline static INT_PTR Utils_RestoreWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { +__forceinline INT_PTR Utils_RestoreWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { return Utils_RestoreWindowPositionEx(hwnd, 0, hContact, szModule, szNamePrefix); } -__inline static INT_PTR Utils_RestoreWindowPositionNoSize(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { +__forceinline INT_PTR Utils_RestoreWindowPositionNoSize(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { return Utils_RestoreWindowPositionEx(hwnd, RWPF_NOSIZE, hContact, szModule, szNamePrefix); } -__inline static INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { +__forceinline INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) { return Utils_RestoreWindowPositionEx(hwnd, RWPF_NOMOVE, hContact, szModule, szNamePrefix); } @@ -262,7 +262,7 @@ __inline static INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd, HANDLE hCon //lParam = 0 //returns <0 on error, 0 if not changed the rect, 1 if changed the rect #define MS_UTILS_ASSERTINSIDESCREEN "Utils/AssertInsideScreen" -__inline static INT_PTR Utils_AssertInsideScreen(RECT *rc) { +__forceinline INT_PTR Utils_AssertInsideScreen(RECT *rc) { return CallService(MS_UTILS_ASSERTINSIDESCREEN, (WPARAM)rc, 0); } @@ -404,12 +404,12 @@ typedef struct #define MS_UTILS_REPLACEVARS "Utils/ReplaceVars" -__inline static char* Utils_ReplaceVars(const char *szData) { +__forceinline char* Utils_ReplaceVars(const char *szData) { REPLACEVARSDATA dat = {0}; dat.cbSize = sizeof(dat); return (char*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)szData, (LPARAM)&dat); } -__inline static TCHAR* Utils_ReplaceVarsT(const TCHAR *szData) { +__forceinline TCHAR* Utils_ReplaceVarsT(const TCHAR *szData) { REPLACEVARSDATA dat = {0}; dat.cbSize = sizeof(dat); dat.dwFlags = RVF_TCHAR; -- cgit v1.2.3