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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/tcmalloc/chromium/src/windows/mingw.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
« third_party/tcmalloc/chromium/src/common.cc ('K') | « third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in ('k') | third_party/tcmalloc/chromium/src/windows/port.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/chromium/src/windows/mingw.h
===================================================================
--- third_party/tcmalloc/chromium/src/windows/mingw.h (revision 94429)
+++ third_party/tcmalloc/chromium/src/windows/mingw.h (working copy)
@@ -53,8 +53,6 @@
# define _WIN32_WINNT 0x0501
#endif
-#include "windows/port.h"
-
#define HAVE_SNPRINTF 1
// Some mingw distributions have a pthreads wrapper, but it doesn't
@@ -62,6 +60,8 @@
// pretend the pthreads wrapper doesn't exist, even when it does.
#undef HAVE_PTHREAD
+#include "windows/port.h"
+
#endif /* __MINGW32__ */
#endif /* GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_ */
« third_party/tcmalloc/chromium/src/common.cc ('K') | « third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h.in ('k') | third_party/tcmalloc/chromium/src/windows/port.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698