Side by Side Diff: src/plugin/PluginStdAfx.h
Issue 5750789393874944:
[IE] First round of ATL removal (Closed)
Patch Set:
Created June 20, 2014, 9:22 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« src/plugin/PluginMutex.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginSystem.h » ('j')
|
src/plugin/PluginUtil.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #ifndef _STDAFX_H | 1 #ifndef _STDAFX_H |
| 2 #define _STDAFX_H | 2 #define _STDAFX_H |
| 3 | 3 |
| 4 #if _MSC_VER > 1000 | 4 #if _MSC_VER > 1000 |
| 5 #pragma once | 5 #pragma once |
| 6 #endif // _MSC_VER > 1000 | 6 #endif // _MSC_VER > 1000 |
| 7 | 7 |
| 8 // Embed manifest as a resource, to enable common controls | 8 // Embed manifest as a resource, to enable common controls |
| 9 // see http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175(v=vs.85) .aspx#using_manifests | 9 // see http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175(v=vs.85) .aspx#using_manifests |
| 10 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windo ws.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken=' 6595b64144ccf1df' language='*'\"") | 10 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windo ws.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken=' 6595b64144ccf1df' language='*'\"") |
| 11 | 11 |
| 12 | 12 |
| 13 //#define STRICT | 13 //#define STRICT |
| 14 #define WINVER 0x0501 | 14 #define WINVER 0x0501 |
| 15 | 15 |
| 16 #ifndef _WIN32_WINNT | 16 #ifndef _WIN32_WINNT |
| 17 #define _WIN32_WINNT 0x0501 | 17 #define _WIN32_WINNT 0x0501 |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 #define _ATL_APARTMENT_THREADED | 20 #define _ATL_APARTMENT_THREADED |
| 21 | 21 |
| 22 //#define _CRT_SECURE_NO_DEPRECATE 1 | 22 //#define _CRT_SECURE_NO_DEPRECATE 1 |
| 23 #include <atlbase.h> | 23 #include "ATL_Deprecate.h" |
| 24 #include <atlstr.h> | |
| 25 #include <atltypes.h> | |
| 26 | 24 |
| 27 extern CComModule _Module; | 25 extern CComModule _Module; |
| 28 #include <comutil.h> | 26 #include <comutil.h> |
| 29 #include <atlcom.h> | 27 |
| 30 #include <atlhost.h> | |
| 31 #include <stdio.h> | 28 #include <stdio.h> |
| 32 #include <assert.h> | 29 #include <assert.h> |
| 33 #include <stdexcept> | 30 #include <stdexcept> |
| 34 #include <ExDisp.h> | 31 #include <ExDisp.h> |
| 35 #include <ExDispID.h> | 32 #include <ExDispID.h> |
| 36 #include <Mshtml.h> | 33 #include <Mshtml.h> |
| 37 | 34 |
| 38 #include <map> | 35 #include <map> |
| 39 #include <set> | 36 #include <set> |
| 40 #include <vector> | 37 #include <vector> |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 | 88 |
| 92 #ifndef countof | 89 #ifndef countof |
| 93 #define countof(x) (sizeof(x)/sizeof(*x)) | 90 #define countof(x) (sizeof(x)/sizeof(*x)) |
| 94 #endif | 91 #endif |
| 95 | 92 |
| 96 #ifdef USE_CONSOLE | 93 #ifdef USE_CONSOLE |
| 97 #include "Console.h" | 94 #include "Console.h" |
| 98 #endif | 95 #endif |
| 99 | 96 |
| 100 #include "BuildVariant.h" | 97 #include "BuildVariant.h" |
| OLD | NEW |
« src/plugin/PluginMutex.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginSystem.h » ('j')
|
src/plugin/PluginUtil.h » ('J')
