Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: client/crashpad_info.h

Issue 1123643004: win: Fix multiple definition at link time for kSignature (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | client/crashpad_info.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 //! disabled by SetCrashpadHandlerState(). Even when forwarding is enabled, 86 //! disabled by SetCrashpadHandlerState(). Even when forwarding is enabled,
87 //! the Crashpad handler may choose not to forward all exceptions to the 87 //! the Crashpad handler may choose not to forward all exceptions to the
88 //! system’s crash reporter in cases where it has reason to believe that the 88 //! system’s crash reporter in cases where it has reason to believe that the
89 //! system’s crash reporter would not normally have handled the exception in 89 //! system’s crash reporter would not normally have handled the exception in
90 //! Crashpad’s absence. 90 //! Crashpad’s absence.
91 void set_system_crash_reporter_forwarding( 91 void set_system_crash_reporter_forwarding(
92 TriState system_crash_reporter_forwarding) { 92 TriState system_crash_reporter_forwarding) {
93 system_crash_reporter_forwarding_ = system_crash_reporter_forwarding; 93 system_crash_reporter_forwarding_ = system_crash_reporter_forwarding;
94 } 94 }
95 95
96 static const uint32_t kSignature = 'CPad'; 96 enum : uint32_t {
97 kSignature = 'CPad',
98 };
97 99
98 private: 100 private:
99 // The compiler won’t necessarily see anyone using these fields, but it 101 // The compiler won’t necessarily see anyone using these fields, but it
100 // shouldn’t warn about that. These fields aren’t intended for use by the 102 // shouldn’t warn about that. These fields aren’t intended for use by the
101 // process they’re found in, they’re supposed to be read by the crash 103 // process they’re found in, they’re supposed to be read by the crash
102 // reporting process. 104 // reporting process.
103 #if defined(__clang__) 105 #if defined(__clang__)
104 #pragma clang diagnostic push 106 #pragma clang diagnostic push
105 #pragma clang diagnostic ignored "-Wunused-private-field" 107 #pragma clang diagnostic ignored "-Wunused-private-field"
106 #endif 108 #endif
(...skipping 10 matching lines...) Expand all
117 #if defined(__clang__) 119 #if defined(__clang__)
118 #pragma clang diagnostic pop 120 #pragma clang diagnostic pop
119 #endif 121 #endif
120 122
121 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); 123 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo);
122 }; 124 };
123 125
124 } // namespace crashpad 126 } // namespace crashpad
125 127
126 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ 128 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_
OLDNEW
« no previous file with comments | « no previous file | client/crashpad_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698