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

base/allocator/generic_allocators.cc

Index: base/allocator/generic_allocators.cc
===================================================================
--- base/allocator/generic_allocators.cc	(revision 33615)
+++ base/allocator/generic_allocators.cc	(working copy)
@@ -48,10 +48,6 @@
   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,
@@ -63,6 +59,10 @@
   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;