Fixing references to the removed atomicops_internals_pnacl.h file.

2 files changed, 112 insertions, 112 deletions

diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in
index abd70616..4b572bb6 100644
--- a/cmake/extract_includes.bat.in
+++ b/cmake/extract_includes.bat.in
@@ -80,10 +80,10 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_intern
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_gcc.h include\google\protobuf\stubs\atomicops_internals_arm_gcc.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_qnx.h include\google\protobuf\stubs\atomicops_internals_arm_qnx.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_atomicword_compat.h include\google\protobuf\stubs\atomicops_internals_atomicword_compat.h
+copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h include\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_gcc.h include\google\protobuf\stubs\atomicops_internals_generic_gcc.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_macosx.h include\google\protobuf\stubs\atomicops_internals_macosx.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_mips_gcc.h include\google\protobuf\stubs\atomicops_internals_mips_gcc.h
-copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_pnacl.h include\google\protobuf\stubs\atomicops_internals_pnacl.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_power.h include\google\protobuf\stubs\atomicops_internals_power.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_ppc_gcc.h include\google\protobuf\stubs\atomicops_internals_ppc_gcc.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_solaris.h include\google\protobuf\stubs\atomicops_internals_solaris.h
diff --git a/src/Makefile.am b/src/Makefile.am
index faee6d96..8d9e07ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,117 +61,117 @@ CLEANFILES = $(protoc_outputs) unittest_proto_middleman \
 MAINTAINERCLEANFILES =   \
   Makefile.in
 
-nobase_include_HEADERS =                                        \
-  google/protobuf/stubs/atomic_sequence_num.h                   \
-  google/protobuf/stubs/atomicops.h                             \
-  google/protobuf/stubs/atomicops_internals_power.h             \
-  google/protobuf/stubs/atomicops_internals_ppc_gcc.h           \
-  google/protobuf/stubs/atomicops_internals_arm64_gcc.h         \
-  google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
-  google/protobuf/stubs/atomicops_internals_arm_qnx.h           \
-  google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
-  google/protobuf/stubs/atomicops_internals_generic_gcc.h       \
-  google/protobuf/stubs/atomicops_internals_macosx.h            \
-  google/protobuf/stubs/atomicops_internals_mips_gcc.h          \
-  google/protobuf/stubs/atomicops_internals_pnacl.h             \
-  google/protobuf/stubs/atomicops_internals_solaris.h           \
-  google/protobuf/stubs/atomicops_internals_tsan.h              \
-  google/protobuf/stubs/atomicops_internals_x86_gcc.h           \
-  google/protobuf/stubs/atomicops_internals_x86_msvc.h          \
-  google/protobuf/stubs/callback.h                              \
-  google/protobuf/stubs/bytestream.h                            \
-  google/protobuf/stubs/casts.h                                 \
-  google/protobuf/stubs/common.h                                \
-  google/protobuf/stubs/fastmem.h                               \
-  google/protobuf/stubs/hash.h                                  \
-  google/protobuf/stubs/logging.h                               \
-  google/protobuf/stubs/macros.h                                \
-  google/protobuf/stubs/mutex.h                                 \
-  google/protobuf/stubs/once.h                                  \
-  google/protobuf/stubs/platform_macros.h                       \
-  google/protobuf/stubs/port.h                                  \
-  google/protobuf/stubs/scoped_ptr.h                            \
-  google/protobuf/stubs/shared_ptr.h                            \
-  google/protobuf/stubs/singleton.h                             \
-  google/protobuf/stubs/status.h                                \
-  google/protobuf/stubs/stl_util.h                              \
-  google/protobuf/stubs/stringpiece.h                           \
-  google/protobuf/stubs/template_util.h                         \
-  google/protobuf/stubs/type_traits.h                           \
-  google/protobuf/any.pb.h                                      \
-  google/protobuf/api.pb.h                                      \
-  google/protobuf/any.h                                         \
-  google/protobuf/arena.h                                       \
-  google/protobuf/arenastring.h                                 \
-  google/protobuf/descriptor_database.h                         \
-  google/protobuf/descriptor.h                                  \
-  google/protobuf/descriptor.pb.h                               \
-  google/protobuf/duration.pb.h                                 \
-  google/protobuf/dynamic_message.h                             \
-  google/protobuf/empty.pb.h                                    \
-  google/protobuf/extension_set.h                               \
-  google/protobuf/field_mask.pb.h                               \
-  google/protobuf/generated_enum_reflection.h                   \
-  google/protobuf/generated_enum_util.h                         \
-  google/protobuf/generated_message_reflection.h                \
-  google/protobuf/generated_message_util.h                      \
-  google/protobuf/has_bits.h                                    \
-  google/protobuf/map_entry.h                                   \
-  google/protobuf/map_entry_lite.h                              \
-  google/protobuf/map_field.h                                   \
-  google/protobuf/map_field_inl.h                               \
-  google/protobuf/map_field_lite.h                              \
-  google/protobuf/map.h                                         \
-  google/protobuf/map_type_handler.h                            \
-  google/protobuf/message.h                                     \
-  google/protobuf/message_lite.h                                \
-  google/protobuf/metadata.h                                    \
-  google/protobuf/reflection.h                                  \
-  google/protobuf/reflection_ops.h                              \
-  google/protobuf/repeated_field.h                              \
-  google/protobuf/service.h                                     \
-  google/protobuf/source_context.pb.h                           \
-  google/protobuf/struct.pb.h                                   \
-  google/protobuf/text_format.h                                 \
-  google/protobuf/timestamp.pb.h                                \
-  google/protobuf/type.pb.h                                     \
-  google/protobuf/unknown_field_set.h                           \
-  google/protobuf/wire_format.h                                 \
-  google/protobuf/wire_format_lite.h                            \
-  google/protobuf/wire_format_lite_inl.h                        \
-  google/protobuf/wrappers.pb.h                                 \
-  google/protobuf/io/coded_stream.h                             \
-  $(GZHEADERS)                                                  \
-  google/protobuf/io/printer.h                                  \
-  google/protobuf/io/strtod.h                                   \
-  google/protobuf/io/tokenizer.h                                \
-  google/protobuf/io/zero_copy_stream.h                         \
-  google/protobuf/io/zero_copy_stream_impl.h                    \
-  google/protobuf/io/zero_copy_stream_impl_lite.h               \
-  google/protobuf/compiler/code_generator.h                     \
-  google/protobuf/compiler/command_line_interface.h             \
-  google/protobuf/compiler/importer.h                           \
-  google/protobuf/compiler/parser.h                             \
-  google/protobuf/compiler/plugin.h                             \
-  google/protobuf/compiler/plugin.pb.h                          \
-  google/protobuf/compiler/cpp/cpp_generator.h                  \
-  google/protobuf/compiler/csharp/csharp_generator.h            \
-  google/protobuf/compiler/csharp/csharp_names.h                \
-  google/protobuf/compiler/java/java_generator.h                \
-  google/protobuf/compiler/java/java_names.h                    \
-  google/protobuf/compiler/javanano/javanano_generator.h        \
-  google/protobuf/compiler/js/js_generator.h                    \
-  google/protobuf/compiler/objectivec/objectivec_generator.h    \
-  google/protobuf/compiler/objectivec/objectivec_helpers.h      \
-  google/protobuf/compiler/php/php_generator.h                  \
-  google/protobuf/compiler/python/python_generator.h            \
-  google/protobuf/compiler/ruby/ruby_generator.h                \
-  google/protobuf/util/type_resolver.h                          \
-  google/protobuf/util/field_comparator.h                       \
-  google/protobuf/util/field_mask_util.h                        \
-  google/protobuf/util/json_util.h                              \
-  google/protobuf/util/time_util.h                              \
-  google/protobuf/util/type_resolver_util.h                     \
+nobase_include_HEADERS =                                         \
+  google/protobuf/stubs/atomic_sequence_num.h                    \
+  google/protobuf/stubs/atomicops.h                              \
+  google/protobuf/stubs/atomicops_internals_power.h              \
+  google/protobuf/stubs/atomicops_internals_ppc_gcc.h            \
+  google/protobuf/stubs/atomicops_internals_arm64_gcc.h          \
+  google/protobuf/stubs/atomicops_internals_arm_gcc.h            \
+  google/protobuf/stubs/atomicops_internals_arm_qnx.h            \
+  google/protobuf/stubs/atomicops_internals_atomicword_compat.h  \
+  google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h \
+  google/protobuf/stubs/atomicops_internals_generic_gcc.h        \
+  google/protobuf/stubs/atomicops_internals_macosx.h             \
+  google/protobuf/stubs/atomicops_internals_mips_gcc.h           \
+  google/protobuf/stubs/atomicops_internals_solaris.h            \
+  google/protobuf/stubs/atomicops_internals_tsan.h               \
+  google/protobuf/stubs/atomicops_internals_x86_gcc.h            \
+  google/protobuf/stubs/atomicops_internals_x86_msvc.h           \
+  google/protobuf/stubs/callback.h                               \
+  google/protobuf/stubs/bytestream.h                             \
+  google/protobuf/stubs/casts.h                                  \
+  google/protobuf/stubs/common.h                                 \
+  google/protobuf/stubs/fastmem.h                                \
+  google/protobuf/stubs/hash.h                                   \
+  google/protobuf/stubs/logging.h                                \
+  google/protobuf/stubs/macros.h                                 \
+  google/protobuf/stubs/mutex.h                                  \
+  google/protobuf/stubs/once.h                                   \
+  google/protobuf/stubs/platform_macros.h                        \
+  google/protobuf/stubs/port.h                                   \
+  google/protobuf/stubs/scoped_ptr.h                             \
+  google/protobuf/stubs/shared_ptr.h                             \
+  google/protobuf/stubs/singleton.h                              \
+  google/protobuf/stubs/status.h                                 \
+  google/protobuf/stubs/stl_util.h                               \
+  google/protobuf/stubs/stringpiece.h                            \
+  google/protobuf/stubs/template_util.h                          \
+  google/protobuf/stubs/type_traits.h                            \
+  google/protobuf/any.pb.h                                       \
+  google/protobuf/api.pb.h                                       \
+  google/protobuf/any.h                                          \
+  google/protobuf/arena.h                                        \
+  google/protobuf/arenastring.h                                  \
+  google/protobuf/descriptor_database.h                          \
+  google/protobuf/descriptor.h                                   \
+  google/protobuf/descriptor.pb.h                                \
+  google/protobuf/duration.pb.h                                  \
+  google/protobuf/dynamic_message.h                              \
+  google/protobuf/empty.pb.h                                     \
+  google/protobuf/extension_set.h                                \
+  google/protobuf/field_mask.pb.h                                \
+  google/protobuf/generated_enum_reflection.h                    \
+  google/protobuf/generated_enum_util.h                          \
+  google/protobuf/generated_message_reflection.h                 \
+  google/protobuf/generated_message_util.h                       \
+  google/protobuf/has_bits.h                                     \
+  google/protobuf/map_entry.h                                    \
+  google/protobuf/map_entry_lite.h                               \
+  google/protobuf/map_field.h                                    \
+  google/protobuf/map_field_inl.h                                \
+  google/protobuf/map_field_lite.h                               \
+  google/protobuf/map.h                                          \
+  google/protobuf/map_type_handler.h                             \
+  google/protobuf/message.h                                      \
+  google/protobuf/message_lite.h                                 \
+  google/protobuf/metadata.h                                     \
+  google/protobuf/reflection.h                                   \
+  google/protobuf/reflection_ops.h                               \
+  google/protobuf/repeated_field.h                               \
+  google/protobuf/service.h                                      \
+  google/protobuf/source_context.pb.h                            \
+  google/protobuf/struct.pb.h                                    \
+  google/protobuf/text_format.h                                  \
+  google/protobuf/timestamp.pb.h                                 \
+  google/protobuf/type.pb.h                                      \
+  google/protobuf/unknown_field_set.h                            \
+  google/protobuf/wire_format.h                                  \
+  google/protobuf/wire_format_lite.h                             \
+  google/protobuf/wire_format_lite_inl.h                         \
+  google/protobuf/wrappers.pb.h                                  \
+  google/protobuf/io/coded_stream.h                              \
+  $(GZHEADERS)                                                   \
+  google/protobuf/io/printer.h                                   \
+  google/protobuf/io/strtod.h                                    \
+  google/protobuf/io/tokenizer.h                                 \
+  google/protobuf/io/zero_copy_stream.h                          \
+  google/protobuf/io/zero_copy_stream_impl.h                     \
+  google/protobuf/io/zero_copy_stream_impl_lite.h                \
+  google/protobuf/compiler/code_generator.h                      \
+  google/protobuf/compiler/command_line_interface.h              \
+  google/protobuf/compiler/importer.h                            \
+  google/protobuf/compiler/parser.h                              \
+  google/protobuf/compiler/plugin.h                              \
+  google/protobuf/compiler/plugin.pb.h                           \
+  google/protobuf/compiler/cpp/cpp_generator.h                   \
+  google/protobuf/compiler/csharp/csharp_generator.h             \
+  google/protobuf/compiler/csharp/csharp_names.h                 \
+  google/protobuf/compiler/java/java_generator.h                 \
+  google/protobuf/compiler/java/java_names.h                     \
+  google/protobuf/compiler/javanano/javanano_generator.h         \
+  google/protobuf/compiler/js/js_generator.h                     \
+  google/protobuf/compiler/objectivec/objectivec_generator.h     \
+  google/protobuf/compiler/objectivec/objectivec_helpers.h       \
+  google/protobuf/compiler/php/php_generator.h                   \
+  google/protobuf/compiler/python/python_generator.h             \
+  google/protobuf/compiler/ruby/ruby_generator.h                 \
+  google/protobuf/util/type_resolver.h                           \
+  google/protobuf/util/field_comparator.h                        \
+  google/protobuf/util/field_mask_util.h                         \
+  google/protobuf/util/json_util.h                               \
+  google/protobuf/util/time_util.h                               \
+  google/protobuf/util/type_resolver_util.h                      \
   google/protobuf/util/message_differencer.h
 
 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la