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

Side by Side Diff: third_party/tcmalloc/chromium/src/windows/config.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 /* 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 /* Define to 1 if you have the <inttypes.h> header file. */ 85 /* Define to 1 if you have the <inttypes.h> header file. */
86 #undef HAVE_INTTYPES_H 86 #undef HAVE_INTTYPES_H
87 87
88 /* Define to 1 if you have the <libunwind.h> header file. */ 88 /* Define to 1 if you have the <libunwind.h> header file. */
89 #undef HAVE_LIBUNWIND_H 89 #undef HAVE_LIBUNWIND_H
90 90
91 /* Define to 1 if you have the <linux/ptrace.h> header file. */ 91 /* Define to 1 if you have the <linux/ptrace.h> header file. */
92 #undef HAVE_LINUX_PTRACE_H 92 #undef HAVE_LINUX_PTRACE_H
93 93
94 /* Define to 1 if you have the <malloc.h> header file. */ 94 /* Define to 1 if you have the <malloc.h> header file. */
95 #undef HAVE_MALLOC_H 95 #define HAVE_MALLOC_H 1
96 96
97 /* Define to 1 if you have the <memory.h> header file. */ 97 /* Define to 1 if you have the <memory.h> header file. */
98 #undef HAVE_MEMORY_H 98 #undef HAVE_MEMORY_H
99 99
100 /* Define to 1 if you have a working `mmap' system call. */ 100 /* Define to 1 if you have a working `mmap' system call. */
101 #undef HAVE_MMAP 101 #undef HAVE_MMAP
102 102
103 /* define if the compiler implements namespaces */ 103 /* define if the compiler implements namespaces */
104 #define HAVE_NAMESPACES 1 104 #define HAVE_NAMESPACES 1
105 105
(...skipping 23 matching lines...) Expand all
129 129
130 /* Define to 1 if you have the <strings.h> header file. */ 130 /* Define to 1 if you have the <strings.h> header file. */
131 #undef HAVE_STRINGS_H 131 #undef HAVE_STRINGS_H
132 132
133 /* Define to 1 if you have the <string.h> header file. */ 133 /* Define to 1 if you have the <string.h> header file. */
134 #define HAVE_STRING_H 1 134 #define HAVE_STRING_H 1
135 135
136 /* Define to 1 if the system has the type `struct mallinfo'. */ 136 /* Define to 1 if the system has the type `struct mallinfo'. */
137 #undef HAVE_STRUCT_MALLINFO 137 #undef HAVE_STRUCT_MALLINFO
138 138
139 /* Define to 1 if you have the <sys/param.h> header file. */
140 #undef HAVE_SYS_PARAM_H
141
139 /* Define to 1 if you have the <sys/prctl.h> header file. */ 142 /* Define to 1 if you have the <sys/prctl.h> header file. */
140 #undef HAVE_SYS_PRCTL_H 143 #undef HAVE_SYS_PRCTL_H
141 144
142 /* Define to 1 if you have the <sys/resource.h> header file. */ 145 /* Define to 1 if you have the <sys/resource.h> header file. */
143 #undef HAVE_SYS_RESOURCE_H 146 #undef HAVE_SYS_RESOURCE_H
144 147
145 /* Define to 1 if you have the <sys/socket.h> header file. */ 148 /* Define to 1 if you have the <sys/socket.h> header file. */
146 #undef HAVE_SYS_SOCKET_H 149 #undef HAVE_SYS_SOCKET_H
147 150
148 /* Define to 1 if you have the <sys/stat.h> header file. */ 151 /* Define to 1 if you have the <sys/stat.h> header file. */
149 #define HAVE_SYS_STAT_H 1 152 #define HAVE_SYS_STAT_H 1
150 153
151 /* Define to 1 if you have the <sys/syscall.h> header file. */ 154 /* Define to 1 if you have the <sys/syscall.h> header file. */
152 #undef HAVE_SYS_SYSCALL_H 155 #undef HAVE_SYS_SYSCALL_H
153 156
154 /* Define to 1 if you have the <sys/types.h> header file. */ 157 /* Define to 1 if you have the <sys/types.h> header file. */
155 #define HAVE_SYS_TYPES_H 1 158 #define HAVE_SYS_TYPES_H 1
156 159
157 /* Define to 1 if you have the <sys/ucontext.h> header file. */ 160 /* <sys/ucontext.h> is broken on redhat 7 */
158 #undef HAVE_SYS_UCONTEXT_H 161 #undef HAVE_SYS_UCONTEXT_H
159 162
160 /* Define to 1 if you have the <sys/wait.h> header file. */ 163 /* Define to 1 if you have the <sys/wait.h> header file. */
161 #undef HAVE_SYS_WAIT_H 164 #undef HAVE_SYS_WAIT_H
162 165
163 /* Define to 1 if compiler supports __thread */ 166 /* Define to 1 if compiler supports __thread */
164 #define HAVE_TLS 1 167 #define HAVE_TLS 1
165 168
166 /* Define to 1 if you have the <ucontext.h> header file. */ 169 /* Define to 1 if you have the <ucontext.h> header file. */
167 #undef HAVE_UCONTEXT_H 170 #undef HAVE_UCONTEXT_H
168 171
169 /* Define to 1 if you have the <unistd.h> header file. */ 172 /* Define to 1 if you have the <unistd.h> header file. */
170 #undef HAVE_UNISTD_H 173 #undef HAVE_UNISTD_H
171 174
172 /* Define to 1 if you have the <unwind.h> header file. */ 175 /* Define to 1 if you have the <unwind.h> header file. */
173 #undef HAVE_UNWIND_H 176 #undef HAVE_UNWIND_H
174 177
178 /* Define to 1 if you have the <valgrind.h> header file. */
179 #undef HAVE_VALGRIND_H
180
175 /* define if your compiler has __attribute__ */ 181 /* define if your compiler has __attribute__ */
176 #undef HAVE___ATTRIBUTE__ 182 #undef HAVE___ATTRIBUTE__
177 183
178 /* Define to 1 if compiler supports __environ */ 184 /* Define to 1 if compiler supports __environ */
179 #undef HAVE___ENVIRON 185 #undef HAVE___ENVIRON
180 186
181 /* Define to 1 if the system has the type `__int64'. */ 187 /* Define to 1 if the system has the type `__int64'. */
182 #define HAVE___INT64 1 188 #define HAVE___INT64 1
183 189
184 /* prefix where we look for installed files */ 190 /* prefix where we look for installed files */
185 #undef INSTALL_PREFIX 191 #undef INSTALL_PREFIX
186 192
187 /* Define to 1 if int32_t is equivalent to intptr_t */ 193 /* Define to 1 if int32_t is equivalent to intptr_t */
188 #undef INT32_EQUALS_INTPTR 194 #undef INT32_EQUALS_INTPTR
189 195
196 /* Define to the sub-directory in which libtool stores uninstalled libraries.
197 */
198 #undef LT_OBJDIR
199
190 /* Define to 1 if your C compiler doesn't accept -c and -o together. */ 200 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
191 #undef NO_MINUS_C_MINUS_O 201 #undef NO_MINUS_C_MINUS_O
192 202
193 /* Name of package */ 203 /* Name of package */
194 #define PACKAGE "google-perftools" 204 #define PACKAGE "google-perftools"
195 205
196 /* Define to the address where bug reports for this package should be sent. */ 206 /* Define to the address where bug reports for this package should be sent. */
197 #define PACKAGE_BUGREPORT "opensource@google.com" 207 #define PACKAGE_BUGREPORT "opensource@google.com"
198 208
199 /* Define to the full name of this package. */ 209 /* Define to the full name of this package. */
200 #define PACKAGE_NAME "google-perftools" 210 #define PACKAGE_NAME "google-perftools"
201 211
202 /* Define to the full name and version of this package. */ 212 /* Define to the full name and version of this package. */
203 #define PACKAGE_STRING "google-perftools 1.4" 213 #define PACKAGE_STRING "google-perftools 1.7"
204 214
205 /* Define to the one symbol short name of this package. */ 215 /* Define to the one symbol short name of this package. */
206 #define PACKAGE_TARNAME "google-perftools" 216 #define PACKAGE_TARNAME "google-perftools"
207 217
208 /* Define to the home page for this package. */ 218 /* Define to the home page for this package. */
209 #undef PACKAGE_URL 219 #undef PACKAGE_URL
210 220
211 /* Define to the version of this package. */ 221 /* Define to the version of this package. */
212 #define PACKAGE_VERSION "1.4" 222 #define PACKAGE_VERSION "1.7"
213 223
214 /* How to access the PC from a struct ucontext */ 224 /* How to access the PC from a struct ucontext */
215 #undef PC_FROM_UCONTEXT 225 #undef PC_FROM_UCONTEXT
216 226
217 /* Always the empty-string on non-windows systems. On windows, should be 227 /* Always the empty-string on non-windows systems. On windows, should be
218 "__declspec(dllexport)". This way, when we compile the dll, we export our 228 "__declspec(dllexport)". This way, when we compile the dll, we export our
219 functions/classes. It's safe to define this here because config.h is only 229 functions/classes. It's safe to define this here because config.h is only
220 used internally, to compile the DLL, and every DLL source file #includes 230 used internally, to compile the DLL, and every DLL source file #includes
221 "config.h" before anything else. */ 231 "config.h" before anything else. */
222 #ifndef PERFTOOLS_DLL_DECL 232 #ifndef PERFTOOLS_DLL_DECL
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 # define _WIN32_WINNT 0x0501 279 # define _WIN32_WINNT 0x0501
270 #endif 280 #endif
271 281
272 // We want to make sure not to ever try to #include heap-checker.h 282 // We want to make sure not to ever try to #include heap-checker.h
273 #define NO_HEAP_CHECK 1 283 #define NO_HEAP_CHECK 1
274 284
275 // TODO(csilvers): include windows/port.h in every relevant source file instead? 285 // TODO(csilvers): include windows/port.h in every relevant source file instead?
276 #include "windows/port.h" 286 #include "windows/port.h"
277 287
278 #endif /* GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_ */ 288 #endif /* GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_ */
OLDNEW
« no previous file with comments | « third_party/tcmalloc/chromium/src/thread_cache.cc ('k') | third_party/tcmalloc/chromium/src/windows/google/tcmalloc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698