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

Side by Side Diff: third_party/tcmalloc/chromium/src/windows/mingw.h

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* Copyright (c) 2007, Google Inc. 1 /* Copyright (c) 2007, Google Inc.
2 * All rights reserved. 2 * All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #ifndef GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_ 38 #ifndef GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_
39 #define GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_ 39 #define GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_
40 40
41 #ifdef __MINGW32__ 41 #ifdef __MINGW32__
42 42
43 // Older version of the mingw msvcrt don't define _aligned_malloc 43 // Older version of the mingw msvcrt don't define _aligned_malloc
44 #if __MSVCRT_VERSION__ < 0x0700 44 #if __MSVCRT_VERSION__ < 0x0700
45 # define PERFTOOLS_NO_ALIGNED_MALLOC 1 45 # define PERFTOOLS_NO_ALIGNED_MALLOC 1
46 #endif 46 #endif
47 47
48 // This must be defined before the windows.h is included. We need at
49 // least 0x0400 for mutex.h to have access to TryLock, and at least
50 // 0x0501 for patch_functions.cc to have access to GetModuleHandleEx.
51 // (This latter is an optimization we could take out if need be.)
52 #ifndef _WIN32_WINNT
53 # define _WIN32_WINNT 0x0501
54 #endif
55
48 #include "windows/port.h" 56 #include "windows/port.h"
49 57
50 #define HAVE_SNPRINTF 1 58 #define HAVE_SNPRINTF 1
51 59
60 // Some mingw distributions have a pthreads wrapper, but it doesn't
61 // work as well as native windows spinlocks (at least for us). So
62 // pretend the pthreads wrapper doesn't exist, even when it does.
63 #undef HAVE_PTHREAD
64
52 #endif /* __MINGW32__ */ 65 #endif /* __MINGW32__ */
53 66
54 #endif /* GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_ */ 67 #endif /* GOOGLE_PERFTOOLS_WINDOWS_MINGW_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698