diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-28 11:24:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-28 11:24:26 +0000 |
| commit | a3017b9a528c574ef52d4e4e8ea8e5360006a166 (patch) | |
| tree | 6fd4dbe29e1e4bfeb3aa516bbdcd7a86f1be1860 /include | |
| parent | 2962c09b72e3f26c6057077db721a9c6fe3ae180 (diff) | |
new header to isolate Miranda from windows.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@9977 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_core.h | 4 | ||||
| -rw-r--r-- | include/m_system.h | 6 | ||||
| -rw-r--r-- | include/m_types.h | 43 |
3 files changed, 48 insertions, 5 deletions
diff --git a/include/m_core.h b/include/m_core.h index 6d4dfbbd55..e627040b1d 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_CORE_H__
#define M_CORE_H__ 1
+#ifndef M_TYPES_H__
+ #include <m_types.h>
+#endif
+
#ifdef MIR_CORE_EXPORTS
#define MIR_CORE_EXPORT __declspec(dllexport)
#else
diff --git a/include/m_system.h b/include/m_system.h index c8e48e1df4..78c09d2f7d 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -21,12 +21,12 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
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
@@ -40,10 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif
#ifndef _MSC_VER
-// #ifndef FORCEINLINE
-// #define FORCEINLINE __inline
-// #endif
-// #define __forceinline static FORCEINLINE
#define __forceinline inline __attribute__ ((always_inline))
#else
#pragma warning(disable:4244 4245)
diff --git a/include/m_types.h b/include/m_types.h new file mode 100644 index 0000000000..a4d61a3829 --- /dev/null +++ b/include/m_types.h @@ -0,0 +1,43 @@ +/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright 2012-14 Miranda NG project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef M_TYPES_H__
+#define M_TYPES_H__ 1
+
+#ifdef Q_OS_WIN
+
+#define FALSE 0
+#define TRUE 1
+
+typedef void* HANDLE, HICON, HBITMAP;
+typedef int BOOL;
+typedef unsigned int DWORD;
+typedef intptr_t WPARAM, LPARAM;
+typedef char* LPSTR;
+typedef const char* LPCSTR;
+typedef wchar_t* LPWSTR, LPTSTR;
+typedef const wchar_t* LPCWSTR, LPCTSTR;
+
+#endif
+
+#endif // M_TYPES_H__
|