| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2015 Eyeo GmbH | 3  * Copyright (C) 2006-2015 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32 | 32 | 
| 33 #ifndef _WIN32_WINNT | 33 #ifndef _WIN32_WINNT | 
| 34 #define _WIN32_WINNT 0x0501 | 34 #define _WIN32_WINNT 0x0501 | 
| 35 #endif | 35 #endif | 
| 36 | 36 | 
| 37 #define _ATL_APARTMENT_THREADED | 37 #define _ATL_APARTMENT_THREADED | 
| 38 | 38 | 
| 39 //#define _CRT_SECURE_NO_DEPRECATE 1 | 39 //#define _CRT_SECURE_NO_DEPRECATE 1 | 
| 40 #include "ATL_Deprecate.h" | 40 #include "ATL_Deprecate.h" | 
| 41 | 41 | 
| 42 extern CComModule _Module; |  | 
| 43 #include <stdio.h> | 42 #include <stdio.h> | 
| 44 #include <assert.h> | 43 #include <assert.h> | 
| 45 #include <stdexcept> | 44 #include <stdexcept> | 
| 46 #include <ExDisp.h> | 45 #include <ExDisp.h> | 
| 47 #include <ExDispID.h> | 46 #include <ExDispID.h> | 
| 48 #include <Mshtml.h> | 47 #include <Mshtml.h> | 
| 49 | 48 | 
| 50 #include <map> | 49 #include <map> | 
| 51 #include <set> | 50 #include <set> | 
| 52 #include <vector> | 51 #include <vector> | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 70 | 69 | 
| 71 #include "PluginErrorCodes.h" | 70 #include "PluginErrorCodes.h" | 
| 72 #include "Config.h" | 71 #include "Config.h" | 
| 73 #include "Resource.h" | 72 #include "Resource.h" | 
| 74 #include "PluginDebug.h" | 73 #include "PluginDebug.h" | 
| 75 | 74 | 
| 76 #define _CRTDBG_MAP_ALLOC | 75 #define _CRTDBG_MAP_ALLOC | 
| 77 #include <stdlib.h> | 76 #include <stdlib.h> | 
| 78 #include <crtdbg.h> | 77 #include <crtdbg.h> | 
| 79 | 78 | 
| 80 |  | 
| 81 #ifdef _MSC_VER |  | 
| 82 #pragma warning(push) |  | 
| 83 // warning C4996: function call with parameters that might be unsafe |  | 
| 84 #pragma warning(disable : 4996) |  | 
| 85 #endif |  | 
| 86 |  | 
| 87 #endif // not _STDAFX_H | 79 #endif // not _STDAFX_H | 
| 88 | 80 | 
| 89 #ifndef countof | 81 #ifndef countof | 
| 90 #define countof(x) (sizeof(x)/sizeof(*x)) | 82 #define countof(x) (sizeof(x)/sizeof(*x)) | 
| 91 #endif | 83 #endif | 
| 92 | 84 | 
| 93 #ifdef USE_CONSOLE | 85 #ifdef USE_CONSOLE | 
| 94 #include "Console.h" | 86 #include "Console.h" | 
| 95 #endif | 87 #endif | 
| 96 |  | 
| 97 #include "BuildVariant.h" |  | 
| OLD | NEW | 
|---|