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

Side by Side Diff: third_party/protobuf/src/google/protobuf/stubs/atomicops.h

Issue 517273003: Cherry pick r573 from upstream protobuf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2012 Google Inc. All rights reserved. 2 // Copyright 2012 Google Inc. All rights reserved.
3 // http://code.google.com/p/protobuf/ 3 // http://code.google.com/p/protobuf/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // GCC. 178 // GCC.
179 #elif defined(__GNUC__) 179 #elif defined(__GNUC__)
180 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) 180 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
181 #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h> 181 #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
182 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) 182 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM)
183 #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> 183 #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
184 #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64) 184 #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
185 #include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h> 185 #include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h>
186 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX) 186 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX)
187 #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h> 187 #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h>
188 #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) 188 #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) || defined(GOOGLE_PROTOBUF_ARCH_MIPS64)
189 #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> 189 #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h>
190 #elif defined(__pnacl__) 190 #elif defined(__pnacl__)
191 #include <google/protobuf/stubs/atomicops_internals_pnacl.h> 191 #include <google/protobuf/stubs/atomicops_internals_pnacl.h>
192 #else 192 #else
193 GOOGLE_PROTOBUF_ATOMICOPS_ERROR 193 GOOGLE_PROTOBUF_ATOMICOPS_ERROR
194 #endif 194 #endif
195 195
196 // Unknown. 196 // Unknown.
197 #else 197 #else
198 GOOGLE_PROTOBUF_ATOMICOPS_ERROR 198 GOOGLE_PROTOBUF_ATOMICOPS_ERROR
199 #endif 199 #endif
200 200
201 // On some platforms we need additional declarations to make AtomicWord 201 // On some platforms we need additional declarations to make AtomicWord
202 // compatible with our other Atomic* types. 202 // compatible with our other Atomic* types.
203 #if defined(GOOGLE_PROTOBUF_OS_APPLE) 203 #if defined(GOOGLE_PROTOBUF_OS_APPLE)
204 #include <google/protobuf/stubs/atomicops_internals_atomicword_compat.h> 204 #include <google/protobuf/stubs/atomicops_internals_atomicword_compat.h>
205 #endif 205 #endif
206 206
207 #undef GOOGLE_PROTOBUF_ATOMICOPS_ERROR 207 #undef GOOGLE_PROTOBUF_ATOMICOPS_ERROR
208 208
209 #endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY 209 #endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY
210 210
211 #endif // GOOGLE_PROTOBUF_ATOMICOPS_H_ 211 #endif // GOOGLE_PROTOBUF_ATOMICOPS_H_
OLDNEW
« no previous file with comments | « third_party/protobuf/README.chromium ('k') | third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698