Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: third_party/tcmalloc/chromium/src/config_win.h

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/config_win.h
===================================================================
--- third_party/tcmalloc/chromium/src/config_win.h (revision 94429)
+++ third_party/tcmalloc/chromium/src/config_win.h (working copy)
@@ -220,6 +220,13 @@
*/
#undef LT_OBJDIR
+/* Define to 'volatile' if __malloc_hook is declared volatile */
+#ifdef __MALLOC_HOOK_VOLATILE
+#define MALLOC_HOOK_MAYBE_VOLATILE volatile
+#else
+#define MALLOC_HOOK_MAYBE_VOLATILE
+#endif
+
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
@@ -267,6 +274,10 @@
/* printf format code for printing a size_t and ssize_t */
#define PRIxS "Ix"
+/* Mark the systems where we know it's bad if pthreads runs too
+ early before main (before threads are initialized, presumably). */
+#undef PTHREADS_CRASHES_IF_RUN_TOO_EARLY
+
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE

Powered by Google App Engine
This is Rietveld 408576698