diff options
| author | csharp <csharp@chromium.org> | 2015-03-30 14:43:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-30 21:44:27 +0000 |
| commit | 608475f1d391f9fe61645952a87d185dd83a5c55 (patch) | |
| tree | 5381bcfc00dc4247cf6e77eda0a6efc443aa6319 /chrome_elf/blacklist/blacklist.h | |
| parent | b96161b083bfa9e9f38154f91ac0437c40680878 (diff) | |
| download | chromium_src-608475f1d391f9fe61645952a87d185dd83a5c55.zip chromium_src-608475f1d391f9fe61645952a87d185dd83a5c55.tar.gz chromium_src-608475f1d391f9fe61645952a87d185dd83a5c55.tar.bz2 | |
Fix chrome_elf_unittests to handle dlls being blacklisted before the tests start
BUG=463495,463500
Review URL: https://codereview.chromium.org/1024183004
Cr-Commit-Position: refs/heads/master@{#322878}
Diffstat (limited to 'chrome_elf/blacklist/blacklist.h')
| -rw-r--r-- | chrome_elf/blacklist/blacklist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_elf/blacklist/blacklist.h b/chrome_elf/blacklist/blacklist.h index 8a06ef0..bbcf068 100644 --- a/chrome_elf/blacklist/blacklist.h +++ b/chrome_elf/blacklist/blacklist.h @@ -35,7 +35,7 @@ bool LeaveSetupBeacon(); bool ResetBeacon(); // Return the size of the current blacklist. -int BlacklistSize(); +extern "C" int BlacklistSize(); // Returns if true if the blacklist has been initialized. extern "C" bool IsBlacklistInitialized(); @@ -69,7 +69,7 @@ extern "C" void SuccessfullyBlocked(const wchar_t** blocked_dlls, int* size); extern "C" void AddDllsFromRegistryToBlacklist(); // Record that the dll at the given index was blocked. -void BlockedDll(size_t blocked_index); +extern "C" void BlockedDll(size_t blocked_index); // Initializes the DLL blacklist in the current process. This should be called // before any undesirable DLLs might be loaded. If |force| is set to true, then |