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

Side by Side 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, 4 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 /* A manual version of config.h fit for windows machines. */ 1 /* A manual version of config.h fit for windows machines. */
2 2
3 /* Sometimes we accidentally #include this config.h instead of the one 3 /* Sometimes we accidentally #include this config.h instead of the one
4 in .. -- this is particularly true for msys/mingw, which uses the 4 in .. -- this is particularly true for msys/mingw, which uses the
5 unix config.h but also runs code in the windows directory. 5 unix config.h but also runs code in the windows directory.
6 */ 6 */
7 #ifdef __MINGW32__ 7 #ifdef __MINGW32__
8 #include "../config.h" 8 #include "../config.h"
9 #define GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_ 9 #define GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_
10 #endif 10 #endif
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 /* prefix where we look for installed files */ 213 /* prefix where we look for installed files */
214 #undef INSTALL_PREFIX 214 #undef INSTALL_PREFIX
215 215
216 /* Define to 1 if int32_t is equivalent to intptr_t */ 216 /* Define to 1 if int32_t is equivalent to intptr_t */
217 #undef INT32_EQUALS_INTPTR 217 #undef INT32_EQUALS_INTPTR
218 218
219 /* Define to the sub-directory in which libtool stores uninstalled libraries. 219 /* Define to the sub-directory in which libtool stores uninstalled libraries.
220 */ 220 */
221 #undef LT_OBJDIR 221 #undef LT_OBJDIR
222 222
223 /* Define to 'volatile' if __malloc_hook is declared volatile */
224 #ifdef __MALLOC_HOOK_VOLATILE
225 #define MALLOC_HOOK_MAYBE_VOLATILE volatile
226 #else
227 #define MALLOC_HOOK_MAYBE_VOLATILE
228 #endif
229
223 /* Define to 1 if your C compiler doesn't accept -c and -o together. */ 230 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
224 #undef NO_MINUS_C_MINUS_O 231 #undef NO_MINUS_C_MINUS_O
225 232
226 /* Name of package */ 233 /* Name of package */
227 #undef PACKAGE 234 #undef PACKAGE
228 235
229 /* Define to the address where bug reports for this package should be sent. */ 236 /* Define to the address where bug reports for this package should be sent. */
230 #undef PACKAGE_BUGREPORT 237 #undef PACKAGE_BUGREPORT
231 238
232 /* Define to the full name of this package. */ 239 /* Define to the full name of this package. */
(...skipping 27 matching lines...) Expand all
260 267
261 /* printf format code for printing a size_t and ssize_t */ 268 /* printf format code for printing a size_t and ssize_t */
262 #define PRIdS "Id" 269 #define PRIdS "Id"
263 270
264 /* printf format code for printing a size_t and ssize_t */ 271 /* printf format code for printing a size_t and ssize_t */
265 #define PRIuS "Iu" 272 #define PRIuS "Iu"
266 273
267 /* printf format code for printing a size_t and ssize_t */ 274 /* printf format code for printing a size_t and ssize_t */
268 #define PRIxS "Ix" 275 #define PRIxS "Ix"
269 276
277 /* Mark the systems where we know it's bad if pthreads runs too
278 early before main (before threads are initialized, presumably). */
279 #undef PTHREADS_CRASHES_IF_RUN_TOO_EARLY
280
270 /* Define to necessary symbol if this constant uses a non-standard name on 281 /* Define to necessary symbol if this constant uses a non-standard name on
271 your system. */ 282 your system. */
272 #undef PTHREAD_CREATE_JOINABLE 283 #undef PTHREAD_CREATE_JOINABLE
273 284
274 /* Define to 1 if you have the ANSI C header files. */ 285 /* Define to 1 if you have the ANSI C header files. */
275 #define STDC_HEADERS 1 286 #define STDC_HEADERS 1
276 287
277 /* the namespace where STL code like vector<> is defined */ 288 /* the namespace where STL code like vector<> is defined */
278 #define STL_NAMESPACE std 289 #define STL_NAMESPACE std
279 290
(...skipping 22 matching lines...) Expand all
302 # define _WIN32_WINNT 0x0501 313 # define _WIN32_WINNT 0x0501
303 #endif 314 #endif
304 315
305 // We want to make sure not to ever try to #include heap-checker.h 316 // We want to make sure not to ever try to #include heap-checker.h
306 #define NO_HEAP_CHECK 1 317 #define NO_HEAP_CHECK 1
307 318
308 // TODO(csilvers): include windows/port.h in every relevant source file instead? 319 // TODO(csilvers): include windows/port.h in every relevant source file instead?
309 #include "windows/port.h" 320 #include "windows/port.h"
310 321
311 #endif /* GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_ */ 322 #endif /* GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698