3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-10 06:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

win: Fix multiple definition at link time for kSignature

Browse Source 
I'm not sure why I don't get these locally, but the bots aren't happy:

https://build.chromium.org/p/client.crashpad/builders/crashpad_win_dbg/builds/271/steps/compile%20with%20ninja/logs/stdio

FAILED: E:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x64 True crashpad_snapshot_test_module.dll "E:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:crashpad_snapshot_test_module.dll.lib /DLL /OUT:crashpad_snapshot_test_module.dll @crashpad_snapshot_test_module.dll.rsp" 2 mt.exe rc.exe "obj\snapshot\crashpad_snapshot_test_module.crashpad_snapshot_test_module.dll.intermediate.manifest" obj\snapshot\crashpad_snapshot_test_module.crashpad_snapshot_test_module.dll.generated.manifest
crashpad_client.lib(crashpad_client.crashpad_info.obj) : error LNK2005: "public: static unsigned int const crashpad::CrashpadInfo::kSignature" (?kSignature@CrashpadInfo@crashpad@@2IB) already defined in crashpad_snapshot_test_module.crashpad_info_client_options_test_module.obj

R=mark@chromium.org
BUG=crashpad:1

Review URL: https://codereview.chromium.org/1123643004
This commit is contained in:
Scott Graham 2015-05-04 16:02:28 -07:00
parent d8713a576b
commit 720882cc14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/crashpad_info.cc
View File

@ -93,6 +93,4 @@ CrashpadInfo::CrashpadInfo()
simple_annotations_(nullptr) { simple_annotations_(nullptr) {
} }
const uint32_t CrashpadInfo::kSignature;
} // namespace crashpad } // namespace crashpad

4
client/crashpad_info.h
View File

@ -93,7 +93,9 @@ struct CrashpadInfo {
system_crash_reporter_forwarding_ = system_crash_reporter_forwarding; system_crash_reporter_forwarding_ = system_crash_reporter_forwarding;
} }
static const uint32_t kSignature = 'CPad'; enum : uint32_t {
kSignature = 'CPad',
};
private: private:
// The compiler won’t necessarily see anyone using these fields, but it // The compiler won’t necessarily see anyone using these fields, but it