Make no-tcmalloc (really, non-base/allocator) builds work again,...

base/allocator/generic_allocators.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // When possible, we implement allocator functions on top of the basic
 // low-level functions malloc() and free().  This way, including a new
 // allocator is as simple as providing just a small interface.
 //
 // As such, this file should not contain any allocator-specific code.
 
@@ skipping 30 matching lines @@
 }
 
 void* operator new(size_t size, const std::nothrow_t& nt) __THROW {
   return generic_cpp_alloc(size, true);
 }
 
 void* operator new[](size_t size, const std::nothrow_t& nt) __THROW {
   return generic_cpp_alloc(size, true);
 }
 
-}  // extern "C++"
-
-extern "C" {
-
 // This function behaves similarly to MSVC's _set_new_mode.
 // If flag is 0 (default), calls to malloc will behave normally.
 // If flag is 1, calls to malloc will behave like calls to new,
 // and the std_new_handler will be invoked on failure.
 // Returns the previous mode.
 int _set_new_mode(int flag) __THROW {
   int old_mode = new_mode;
   new_mode = flag;
   return old_mode;
 }
 
+}  // extern "C++"
+
+extern "C" {
+
 void* calloc(size_t n, size_t elem_size) __THROW {
   // Overflow check
   const size_t size = n * elem_size;
   if (elem_size != 0 && size / elem_size != n) return NULL;
 
   void* result = malloc(size);
   if (result != NULL) {
     memset(result, 0, size);
   }
   return result;
@@ skipping 52 matching lines @@
 
 void* _calloc_dbg(size_t n, size_t size, int, const char*, int) {
   return calloc(n, size);
 }
 #endif  // NDEBUG
 
 #endif  // WIN32
 
 }  // extern C