Side by Side Diff: src/plugin/PluginStdAfx.h
Issue 5948518908821504:
Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections (Closed)
Patch Set:
Created Aug. 6, 2014, 7:38 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« src/plugin/PluginClass.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginTab.h » ('j')
|
src/plugin/PluginTabBase.cpp » ('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='*'\"") |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 #include <Windows.h> | 47 #include <Windows.h> |
| 48 #include <Sddl.h> | 48 #include <Sddl.h> |
| 49 | 49 |
| 50 | 50 |
| 51 //{{AFX_INSERT_LOCATION}} | 51 //{{AFX_INSERT_LOCATION}} |
| 52 // Microsoft Visual C++ will insert additional declarations immediately before t he previous line. | 52 // Microsoft Visual C++ will insert additional declarations immediately before t he previous line. |
| 53 | 53 |
| 54 #include "PluginDebugMacros.h" | 54 #include "PluginDebugMacros.h" |
| 55 #include "PluginErrorCodes.h" | 55 #include "PluginErrorCodes.h" |
| 56 | 56 |
| 57 #include "Config.h" | |
| 57 | 58 |
| 58 #if (defined PRODUCT_ADBLOCKPLUS) | |
| 59 #include "Config.h" | |
| 60 #endif | |
| 61 | |
| 62 #if (defined PRODUCT_ADBLOCKPLUS) | |
| 63 #if (defined ENTERPRISE) | 59 #if (defined ENTERPRISE) |
| 64 #define CONFIG_IN_REGISTRY | 60 #define CONFIG_IN_REGISTRY |
|
Oleksandr
2014/10/02 21:24:02
We've removed SUPPORT_CONFIG and we are not using
| |
| 65 #endif | 61 #endif |
| 66 #include "Resource.h" | 62 #include "Resource.h" |
| 67 #endif | |
| 68 | 63 |
| 69 #if (defined PRODUCT_ADBLOCKPLUS) | |
| 70 #include "PluginDebug.h" | 64 #include "PluginDebug.h" |
| 71 #endif | |
| 72 | |
| 73 | 65 |
| 74 #define _CRTDBG_MAP_ALLOC | 66 #define _CRTDBG_MAP_ALLOC |
| 75 #include <stdlib.h> | 67 #include <stdlib.h> |
| 76 #include <crtdbg.h> | 68 #include <crtdbg.h> |
| 77 | 69 |
| 78 | 70 |
| 79 #ifdef _MSC_VER | 71 #ifdef _MSC_VER |
| 80 #pragma warning(push) | 72 #pragma warning(push) |
| 81 // warning C4996: function call with parameters that might be unsafe | 73 // warning C4996: function call with parameters that might be unsafe |
| 82 #pragma warning(disable : 4996) | 74 #pragma warning(disable : 4996) |
| 83 #endif | 75 #endif |
| 84 | 76 |
| 85 #endif // not _STDAFX_H | 77 #endif // not _STDAFX_H |
| 86 | 78 |
| 87 #ifndef countof | 79 #ifndef countof |
| 88 #define countof(x) (sizeof(x)/sizeof(*x)) | 80 #define countof(x) (sizeof(x)/sizeof(*x)) |
| 89 #endif | 81 #endif |
| 90 | 82 |
| 91 #ifdef USE_CONSOLE | 83 #ifdef USE_CONSOLE |
| 92 #include "Console.h" | 84 #include "Console.h" |
| 93 #endif | 85 #endif |
| 94 | 86 |
| 95 #include "BuildVariant.h" | 87 #include "BuildVariant.h" |
| OLD | NEW |
« src/plugin/PluginClass.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginTab.h » ('j')
|
src/plugin/PluginTabBase.cpp » ('J')
