diff options
| author | ghazan <ghazan@miranda.im> | 2021-12-19 18:47:56 +0300 |
|---|---|---|
| committer | ghazan <ghazan@miranda.im> | 2021-12-19 18:47:56 +0300 |
| commit | 16809066c4931a34de2403e4c0bfcee3b98f42b5 (patch) | |
| tree | b51fa56f16f3673f9213c1f022f293f21bfc3351 /include | |
| parent | c8fbefe8f38a74bfaea88a195c71a6e0c94c7a6a (diff) | |
further code cleaning
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_options.h | 4 | ||||
| -rw-r--r-- | include/m_system.h | 4 | ||||
| -rw-r--r-- | include/m_types.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/m_options.h b/include/m_options.h index 9c4783fa66..cdc352193b 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -63,12 +63,12 @@ struct OPTIONSDIALOGPAGE {
int position; // a position number, lower numbers are topmost
MAllStrings szTitle, szGroup, szTab; // [TRANSLATED-BY-CORE]
- char *pszTemplate;
+ HPLUGIN pPlugin;
DWORD flags;
#ifdef _WINDOWS
DLGPROC pfnDlgProc;
- HPLUGIN pPlugin;
+ char *pszTemplate;
#endif
union {
diff --git a/include/m_system.h b/include/m_system.h index 9994da7c67..5162b82692 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -39,9 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIRANDA_VER 0x0A00 #endif -#ifndef _MSC_VER - #define __forceinline inline __attribute__ ((always_inline)) -#else +#ifdef _MSC_VER #pragma warning(disable:4244 4245) #endif diff --git a/include/m_types.h b/include/m_types.h index 8538f6c2f2..dd22aa373f 100644 --- a/include/m_types.h +++ b/include/m_types.h @@ -84,6 +84,7 @@ struct LOGFONTW; #define _Pre_notnull_ #define _Always_(x) #define _Printf_format_string_ +#define __forceinline inline __attribute__ ((always_inline)) #define InterlockedIncrement(x) __sync_fetch_and_add(x, 1) #define InterlockedDecrement(x) __sync_fetch_and_add(x, -1) @@ -101,8 +102,6 @@ struct LOGFONTW; #define _vsnprintf vsnprintf #define _vsnwprintf vswprintf -#define __forceinline inline - #define DECLARE_HANDLE(name) struct _##name { int unused; }; typedef struct _##name *name DECLARE_HANDLE(HDC); DECLARE_HANDLE(HWND); |