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

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

 // Copyright (c) 2004, 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 31 matching lines @@
 // _POSIX_C_SOURCE, which it needs so stdlib.h defines posix_memalign.
 // unistd.h, on the other hand, requires _POSIX_C_SOURCE to be unset,
 // at least on Mac OS X, in order to define getpagesize.  The solution
 // is to #include unistd.h first.  This is safe because unistd.h
 // doesn't sub-include stdlib.h, so we'll still get posix_memalign
 // when we #include stdlib.h.  Blah.
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>        // for getpagesize()
 #endif
 #include "tcmalloc.h"      // must come early, to pick up posix_memalign
+#include <assert.h>
 #include <stdlib.h>        // defines posix_memalign
 #include <stdio.h>         // for the printf at the end
 #ifdef HAVE_STDINT_H
 #include <stdint.h>        // for uintptr_t
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>        // for getpagesize()
 #endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+// Malloc can be in several places on older versions of OS X.
+#if defined(HAVE_MALLOC_H)
+#include <malloc.h>        // for memalign() and valloc()
+#elif defined(HAVE_MALLOC_MALLOC_H)
+#include <malloc/malloc.h>
+#elif defined(HAVE_SYS_MALLOC_H)
+#include <sys/malloc.h>
 #endif
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "tests/testutil.h"
 
 
 // Return the next interesting size/delta to check.  Returns -1 if no more.
 static int NextSize(int size) {
   if (size < 100) {
     return size+1;
@@ skipping 133 matching lines @@
       int alloc_needed = ((s + pagesize - 1) / pagesize) * pagesize;
       Fill(p, alloc_needed, 'x');
       CHECK(Valid(p, alloc_needed, 'x'));
       free(p);
     }
   }
 
   printf("PASS\n");
   return 0;
 }