| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #include <AdblockPlus.h> | 18 #include <AdblockPlus.h> |
| 19 #include <functional> | 19 #include <functional> |
| 20 #include <vector> | 20 #include <vector> |
| 21 #include <thread> | 21 #include <thread> |
| 22 #include <Windows.h> | 22 #include <Windows.h> |
| 23 | 23 |
| 24 #include "../shared/AutoHandle.h" | 24 #include "../shared/AutoHandle.h" |
| 25 #include "../shared/Communication.h" | 25 #include "../shared/Communication.h" |
| 26 #include "../shared/Dictionary.h" | 26 #include "../shared/Dictionary.h" |
| 27 #include "../shared/Utils.h" | 27 #include "../shared/Utils.h" |
| 28 #include "../shared/Version.h" | 28 #include "../shared/Version.h" |
| 29 #include "../shared/CriticalSection.h" | 29 #include "../shared/CriticalSection.h" |
| 30 #include "../shared/IE_version.h" | 30 #include "IeVersion.h" |
| 31 #include "AdblockPlus.h" | 31 #include "AdblockPlus.h" |
| 32 #include "Debug.h" | 32 #include "Debug.h" |
| 33 #include "Updater.h" | 33 #include "Updater.h" |
| 34 | 34 |
| 35 namespace | 35 namespace |
| 36 { | 36 { |
| 37 std::auto_ptr<AdblockPlus::FilterEngine> filterEngine; | 37 std::auto_ptr<AdblockPlus::FilterEngine> filterEngine; |
| 38 std::auto_ptr<Updater> updater; | 38 std::auto_ptr<Updater> updater; |
| 39 int activeConnections = 0; | 39 int activeConnections = 0; |
| 40 CriticalSection activeConnectionsLock; | 40 CriticalSection activeConnectionsLock; |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 } | 497 } |
| 498 catch (const std::runtime_error& e) | 498 catch (const std::runtime_error& e) |
| 499 { | 499 { |
| 500 DebugException(e); | 500 DebugException(e); |
| 501 return 1; | 501 return 1; |
| 502 } | 502 } |
| 503 } | 503 } |
| 504 | 504 |
| 505 return 0; | 505 return 0; |
| 506 } | 506 } |
| OLD | NEW |