diff --git a/src/windows/config.h b/src/windows/config.h index 1e19651..0b5630d 100644 --- a/src/windows/config.h +++ b/src/windows/config.h @@ -23,208 +23,230 @@ * For instructions on how to use this mode, see * http://groups.google.com/group/google-perftools/browse_thread/thread/41cd3710af85e57b */ -#undef WIN32_OVERRIDE_ALLOCATORS +/* #undef WIN32_OVERRIDE_ALLOCATORS */ -/* Define to 1 if your libc has a snprintf implementation */ -#if defined(_MSC_VER) && _MSC_VER >= 1900 -#define HAVE_SNPRINTF 1 -#else -#undef HAVE_SNPRINTF -#endif +/* Build new/delete operators for overaligned types */ +/* #undef ENABLE_ALIGNED_NEW_DELETE */ + +/* Build runtime detection for sized delete */ +/* #undef ENABLE_DYNAMIC_SIZED_DELETE */ + +/* Build sized deletion operators */ +/* #undef ENABLE_SIZED_DELETE */ + +/* Define to 1 if compiler supports __builtin_expect */ +/* #undef HAVE_BUILTIN_EXPECT */ /* Define to 1 if compiler supports __builtin_stack_pointer */ -#undef HAVE_BUILTIN_STACK_POINTER +/* #undef HAVE_BUILTIN_STACK_POINTER */ /* Define to 1 if you have the header file. */ -#undef HAVE_CONFLICT_SIGNAL_H +/* #undef HAVE_CONFLICT_SIGNAL_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_CYGWIN_SIGNAL_H +/* #undef HAVE_CYGWIN_SIGNAL_H */ + +/* Define to 1 if you have the declaration of `backtrace', and to 0 if you + don't. */ +/* #undef HAVE_DECL_BACKTRACE */ /* Define to 1 if you have the declaration of `cfree', and to 0 if you don't. */ -#undef HAVE_DECL_CFREE +#define HAVE_DECL_CFREE 0 /* Define to 1 if you have the declaration of `memalign', and to 0 if you don't. */ -#undef HAVE_DECL_MEMALIGN +#define HAVE_DECL_MEMALIGN 0 + +/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you + don't. */ +#define HAVE_DECL_NANOSLEEP 0 /* Define to 1 if you have the declaration of `posix_memalign', and to 0 if you don't. */ -#undef HAVE_DECL_POSIX_MEMALIGN +#define HAVE_DECL_POSIX_MEMALIGN 0 /* Define to 1 if you have the declaration of `pvalloc', and to 0 if you don't. */ -#undef HAVE_DECL_PVALLOC +#define HAVE_DECL_PVALLOC 0 + +/* Define to 1 if you have the declaration of `sleep', and to 0 if you don't. + */ +#define HAVE_DECL_SLEEP 0 /* Define to 1 if you have the declaration of `uname', and to 0 if you don't. */ -#undef HAVE_DECL_UNAME +#define HAVE_DECL_UNAME 0 /* Define to 1 if you have the declaration of `valloc', and to 0 if you don't. */ -#undef HAVE_DECL_VALLOC +#define HAVE_DECL_VALLOC 0 /* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H +/* #undef HAVE_DLFCN_H */ /* Define to 1 if the system has the type `Elf32_Versym'. */ -#undef HAVE_ELF32_VERSYM +/* #undef HAVE_ELF32_VERSYM */ /* Define to 1 if you have the header file. */ -#undef HAVE_EXECINFO_H +/* #undef HAVE_EXECINFO_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H +#define HAVE_FCNTL_H 1 /* Define to 1 if you have the header file. */ -#undef HAVE_FEATURES_H +/* #undef HAVE_FEATURES_H */ + +/* Define to 1 if you have the `fork' function. */ +/* #undef HAVE_FORK */ /* Define to 1 if you have the `geteuid' function. */ -#undef HAVE_GETEUID +/* #undef HAVE_GETEUID */ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 /* we define it in windows/port.cc */ /* Define to 1 if you have the header file. */ -#undef HAVE_GLOB_H +/* #undef HAVE_GLOB_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_GRP_H +/* #undef HAVE_GRP_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H +#if defined(_MSC_VER) && _MSC_VER >= 1900 +#define HAVE_INTTYPES_H 1 +#endif /* Define to 1 if you have the header file. */ -#undef HAVE_LIBUNWIND_H +/* #undef HAVE_LIBUNWIND_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_PTRACE_H +/* #undef HAVE_LINUX_PTRACE_H */ + +/* Define if this is Linux that has SIGEV_THREAD_ID */ +/* #undef HAVE_LINUX_SIGEV_THREAD_ID */ /* Define to 1 if you have the header file. */ #define HAVE_MALLOC_H 1 -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_MALLOC_H - /* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +#define HAVE_MEMORY_H 1 /* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP +/* #undef HAVE_MMAP */ /* define if the compiler implements namespaces */ #define HAVE_NAMESPACES 1 /* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H +/* #undef HAVE_POLL_H */ /* define if libc has program_invocation_name */ -#undef HAVE_PROGRAM_INVOCATION_NAME +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ /* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD +/* #undef HAVE_PTHREAD */ + +/* defined to 1 if pthread symbols are exposed even without include pthread.h + */ +/* #undef HAVE_PTHREAD_DESPITE_ASKING_FOR */ /* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H +/* #undef HAVE_PWD_H */ /* Define to 1 if you have the `sbrk' function. */ -#undef HAVE_SBRK +/* #undef HAVE_SBRK */ /* Define to 1 if you have the header file. */ -#undef HAVE_SCHED_H +/* #undef HAVE_SCHED_H */ /* Define to 1 if you have the header file. */ #if defined(_MSC_VER) && _MSC_VER >= 1900 #define HAVE_STDINT_H 1 -#else -#undef HAVE_STDINT_H #endif /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H +/* #undef HAVE_STRINGS_H */ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 /* Define to 1 if the system has the type `struct mallinfo'. */ -#undef HAVE_STRUCT_MALLINFO +/* #undef HAVE_STRUCT_MALLINFO */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_CDEFS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_MALLOC_H +/* #undef HAVE_SYS_CDEFS_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H +/* #undef HAVE_SYS_PARAM_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PRCTL_H +/* #undef HAVE_SYS_PRCTL_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H +/* #undef HAVE_SYS_RESOURCE_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H +/* #undef HAVE_SYS_SOCKET_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCALL_H +/* #undef HAVE_SYS_SYSCALL_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* is broken on redhat 7 */ -#undef HAVE_SYS_UCONTEXT_H +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UCONTEXT_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H +/* #undef HAVE_SYS_WAIT_H */ /* Define to 1 if compiler supports __thread */ #define HAVE_TLS 1 /* Define to 1 if you have the header file. */ -#undef HAVE_UCONTEXT_H +/* #undef HAVE_UCONTEXT_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H +/* #undef HAVE_UNISTD_H */ + +/* Whether contains _Unwind_Backtrace */ +/* #undef HAVE_UNWIND_BACKTRACE */ /* Define to 1 if you have the header file. */ -#undef HAVE_UNWIND_H +/* #undef HAVE_UNWIND_H */ /* Define to 1 if you have the header file. */ -#undef HAVE_VALGRIND_H +/* #undef HAVE_VALGRIND_H */ /* define if your compiler has __attribute__ */ -#undef HAVE___ATTRIBUTE__ +/* #undef HAVE___ATTRIBUTE__ */ + +/* define if your compiler supports alignment of functions */ +/* #undef HAVE___ATTRIBUTE__ALIGNED_FN */ /* Define to 1 if compiler supports __environ */ -#undef HAVE___ENVIRON +/* #undef HAVE___ENVIRON */ /* Define to 1 if the system has the type `__int64'. */ #define HAVE___INT64 1 /* prefix where we look for installed files */ -#undef INSTALL_PREFIX +/* #undef INSTALL_PREFIX */ /* Define to 1 if int32_t is equivalent to intptr_t */ -#undef INT32_EQUALS_INTPTR +#ifndef _WIN64 +#define INT32_EQUALS_INTPTR 1 +#endif -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 'volatile' if __malloc_hook is declared volatile */ -#undef MALLOC_HOOK_MAYBE_VOLATILE - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +/* #undef LT_OBJDIR */ /* Name of package */ #define PACKAGE "gperftools" @@ -242,13 +264,13 @@ #define PACKAGE_TARNAME "gperftools" /* Define to the home page for this package. */ -#undef PACKAGE_URL +#define PACKAGE_URL "" /* Define to the version of this package. */ #define PACKAGE_VERSION "2.6.90" /* How to access the PC from a struct ucontext */ -#undef PC_FROM_UCONTEXT +/* #undef PC_FROM_UCONTEXT */ /* Always the empty-string on non-windows systems. On windows, should be "__declspec(dllexport)". This way, when we compile the dll, we export our @@ -256,19 +278,31 @@ used internally, to compile the DLL, and every DLL source file #includes "config.h" before anything else. */ #ifndef PERFTOOLS_DLL_DECL -# define PERFTOOLS_IS_A_DLL 1 /* not set if you're statically linking */ -# define PERFTOOLS_DLL_DECL __declspec(dllexport) -# define PERFTOOLS_DLL_DECL_FOR_UNITTESTS __declspec(dllimport) +# define PERFTOOLS_IS_A_DLL 1 /* not set if you're statically linking */ +# define PERFTOOLS_DLL_DECL __declspec(dllexport) +# define PERFTOOLS_DLL_DECL_FOR_UNITTESTS __declspec(dllimport) #endif /* printf format code for printing a size_t and ssize_t */ -#define PRIdS "Id" +#ifdef _WIN64 +#define PRIdS "lld" +#else +#define PRIdS "d" +#endif /* printf format code for printing a size_t and ssize_t */ -#define PRIuS "Iu" +#ifdef _WIN64 +#define PRIuS "llu" +#else +#define PRIuS "u" +#endif /* printf format code for printing a size_t and ssize_t */ -#define PRIxS "Ix" +#ifdef _WIN64 +#define PRIxS "llx" +#else +#define PRIxS "x" +#endif /* Mark the systems where we know it's bad if pthreads runs too early before main (before threads are initialized, presumably). */ @@ -278,16 +312,25 @@ /* Define to necessary symbol if this constant uses a non-standard name on your system. */ -#undef PTHREAD_CREATE_JOINABLE +/* #undef PTHREAD_CREATE_JOINABLE */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* the namespace where STL code like vector<> is defined */ -#define STL_NAMESPACE std +#define STL_NAMESPACE std + +/* Define 32K of internal pages size for tcmalloc */ +/* #undef TCMALLOC_32K_PAGES */ + +/* Define 64K of internal pages size for tcmalloc */ +/* #undef TCMALLOC_64K_PAGES */ + +/* Define 8 bytes of allocation alignment for tcmalloc */ +/* #undef TCMALLOC_ALIGN_8BYTES */ /* Version number of package */ -#undef VERSION +#define VERSION "2.6.90" /* C99 says: define this to get the PRI... macros from stdint.h */ #ifndef __STDC_FORMAT_MACROS @@ -297,7 +340,7 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -#undef inline +/* #undef inline */ #endif // --------------------------------------------------------------------- @@ -311,6 +354,10 @@ # define _WIN32_WINNT 0x0501 #endif +#if defined(_MSC_VER) && _MSC_VER >= 1900 +#define HAVE_SNPRINTF 1 +#endif + // We want to make sure not to ever try to #include heap-checker.h #define NO_HEAP_CHECK 1