diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-12-06 17:40:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-12-06 17:40:29 +0000 |
| commit | 6266d59bee0d06a9d188ec01040659fcee7542e3 (patch) | |
| tree | c34b8805164c6bbae99f47262b00211d6808d9ce /include | |
| parent | 123e0df8cacb3caece0eef2735d929e42873d412 (diff) | |
fixes for vs2012
git-svn-id: http://svn.miranda-ng.org/main/trunk@2666 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_stdhdr.h | 4 | ||||
| -rw-r--r-- | include/win2k.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/m_stdhdr.h b/include/m_stdhdr.h index eedf55946c..85bebfd5d8 100644 --- a/include/m_stdhdr.h +++ b/include/m_stdhdr.h @@ -34,10 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <tchar.h>
-#if _MSC_VER < 1400
-# include <malloc.h> // to avoid a crazy bug in VS2003 header files
-#endif
-
#ifndef __GNUC__
# ifdef _DEBUG
# define _CRTDBG_MAP_ALLOC
diff --git a/include/win2k.h b/include/win2k.h index 8970828c0d..a7ce81fc0f 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -546,7 +546,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #endif /* __ITaskbarList3_INTERFACE_DEFINED__ */
#endif /* _SHLOBJ_H_ */
-#ifndef FTA_Exclude
+#ifndef FILETYPEATTRIBUTEFLAGS
#define FTA_Exclude 0x00000001
#define FTA_Show 0x00000002
#define FTA_HasExtension 0x00000004
|