Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

third_party/tcmalloc/chromium/src/tests/testutil.cc

 // Copyright (c) 2007, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 62 matching lines @@
   }
 #endif  /* HAVE_SYS_RESOURCE_H */
 }
 
 
 struct FunctionAndId {
   void (*ptr_to_function)(int);
   int id;
 };
 
-#if defined(NO_THREADS) || !(defined(HAVE_PTHREADS) || defined(_WIN32))
+#if defined(NO_THREADS) || !(defined(HAVE_PTHREAD) || defined(_WIN32))
 
 extern "C" void RunThread(void (*fn)()) {
   (*fn)();
 }
 
 extern "C" void RunManyThreads(void (*fn)(), int count) {
   // I guess the best we can do is run fn sequentially, 'count' times
   for (int i = 0; i < count; i++)
     (*fn)();
 }
@@ skipping 120 matching lines @@
       SAFE_PTHREAD(pthread_join(thr[i], NULL));
     }
     delete[] fn_and_ids;
     delete[] thr;
 
     pthread_attr_destroy(&attr);
   }
 }
 
 #endif