Protobuf: Remove protobuf globals patch

third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc

 // Copyright 2005-2008 Google Inc. All Rights Reserved.
 // Author: jrm@google.com (Jim Meehan)
 
 #include <google/protobuf/stubs/common.h>
 
 #include <google/protobuf/stubs/stringpiece.h>
 
 namespace google {
 namespace protobuf {
 namespace internal {
@@ skipping 493 matching lines @@
   *bytes_consumed = src - isrc;
   return exit_reason;
 }
 
 // Hack:  On some compilers the static tables are initialized at startup.
 //   We can't use them until they are initialized.  However, some Protocol
 //   Buffer parsing happens at static init time and may try to validate
 //   UTF-8 strings.  Since UTF-8 validation is only used for debugging
 //   anyway, we simply always return success if initialization hasn't
 //   occurred yet.
-extern bool cr_module_initialized_;
+namespace {
+
+bool module_initialized_ = false;
+
+struct InitDetector {
+  InitDetector() {
+    module_initialized_ = true;
+  }
+};
+InitDetector init_detector;
+
+}  // namespace
 
 bool IsStructurallyValidUTF8(const char* buf, int len) {
-  if (!cr_module_initialized_) return true;
+  if (!module_initialized_) return true;
   
   int bytes_consumed = 0;
   UTF8GenericScanFastAscii(&utf8acceptnonsurrogates_obj,
                            buf, len, &bytes_consumed);
   return (bytes_consumed == len);
 }
 
 int UTF8SpnStructurallyValid(const StringPiece& str) {
-  if (!cr_module_initialized_) return str.size();
+  if (!module_initialized_) return str.size();
 
   int bytes_consumed = 0;
   UTF8GenericScanFastAscii(&utf8acceptnonsurrogates_obj,
                            str.data(), str.size(), &bytes_consumed);
   return bytes_consumed;
 }
 
 // Coerce UTF-8 byte string in src_str to be
 // a structurally-valid equal-length string by selectively
 // overwriting illegal bytes with replace_char (typically blank).
@@ skipping 31 matching lines @@
       src += n;
       dst += n;
     }
   }
   return idst;
 }
 
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google