Bug 559537 - Under VS2010, fatal error occurs at atlcore.h. r=ted
This commit is contained in:
Родитель
52e76b838c
Коммит
537da44da1
|
@ -78,7 +78,7 @@
|
||||||
#include "nsIDOMElement.h"
|
#include "nsIDOMElement.h"
|
||||||
|
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
#define _ATL_STATIC_REGISTRY
|
#define _ATL_STATIC_REGISTRY
|
||||||
// #define _ATL_DEBUG_INTERFACES
|
// #define _ATL_DEBUG_INTERFACES
|
||||||
|
|
|
@ -113,7 +113,7 @@
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
|
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
#define _ATL_STATIC_REGISTRY
|
#define _ATL_STATIC_REGISTRY
|
||||||
// #define _ATL_DEBUG_INTERFACES
|
// #define _ATL_DEBUG_INTERFACES
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
#define STRICT
|
#define STRICT
|
||||||
|
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
#define _ATL_STATIC_REGISTRY
|
#define _ATL_STATIC_REGISTRY
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
#define STRICT
|
#define STRICT
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#endif
|
#endif
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
#define STRICT
|
#define STRICT
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#endif
|
#endif
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
|
|
||||||
|
|
|
@ -42,10 +42,10 @@
|
||||||
** setting _WIN32_WINNT to NT 4.0 for winsock.h, winbase.h, winnt.h.
|
** setting _WIN32_WINNT to NT 4.0 for winsock.h, winbase.h, winnt.h.
|
||||||
*/
|
*/
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#elif (_WIN32_WINNT < 0x0400)
|
#elif (_WIN32_WINNT < 0x0403)
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0400
|
#define _WIN32_WINNT 0x0403
|
||||||
#endif /* _WIN32_WINNT */
|
#endif /* _WIN32_WINNT */
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче