diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-13 09:09:32 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-13 09:09:32 +0000 |
| commit | 0b30eb8c87a42ec63d41b943f9536bb94fc3c35b (patch) | |
| tree | ac3e9b4edb7896ec64d1d4e5f407a09cbe609962 | |
| parent | 5d701498ddfc103ae115ed35df564b822e040b04 (diff) | |
Fix the name of thread safety macros.
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index 13156820..b7ac75cc 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -54,7 +54,7 @@ #define GOOGLE_PROTOBUF_ATOMICOPS_H_ // Don't include this file for people not concerned about thread safety. -#ifndef GOOGLE_PROTOBUF_NO_THREADSAFETY +#ifndef GOOGLE_PROTOBUF_NO_THREAD_SAFETY #include <google/protobuf/stubs/platform_macros.h> @@ -197,6 +197,6 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #undef GOOGLE_PROTOBUF_ATOMICOPS_ERROR -#endif // GOOGLE_PROTOBUF_NO_THREADSAFETY +#endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY #endif // GOOGLE_PROTOBUF_ATOMICOPS_H_ diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc index 8366a891..0b359796 100644 --- a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc +++ b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc @@ -32,7 +32,7 @@ // Therefore we move the code depending on windows.h to this separate cc file. // Don't compile this file for people not concerned about thread safety. -#ifndef GOOGLE_PROTOBUF_NO_THREADSAFETY +#ifndef GOOGLE_PROTOBUF_NO_THREAD_SAFETY #include <google/protobuf/stubs/atomicops.h> @@ -109,4 +109,4 @@ Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, } // namespace google #endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_MSVC_H_ -#endif // GOOGLE_PROTOBUF_NO_THREADSAFETY +#endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY |