diff options
Diffstat (limited to 'extern/glog/src/utilities.h')
| -rw-r--r-- | extern/glog/src/utilities.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/extern/glog/src/utilities.h b/extern/glog/src/utilities.h index 5f79968ef55..ca21cfb3884 100644 --- a/extern/glog/src/utilities.h +++ b/extern/glog/src/utilities.h @@ -39,7 +39,9 @@ #elif defined(__CYGWIN__) || defined(__CYGWIN32__) # define OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -# define OS_LINUX +# ifndef OS_LINUX +# define OS_LINUX +# endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) # define OS_MACOSX #elif defined(__FreeBSD__) @@ -97,6 +99,8 @@ // malloc() from the unwinder. This is a problem because we're // trying to use the unwinder to instrument malloc(). // +// 4) The Windows API CaptureStackTrace. +// // Note: if you add a new implementation here, make sure it works // correctly when GetStackTrace() is called with max_depth == 0. // Some code may do that. @@ -110,6 +114,8 @@ # define STACKTRACE_H "stacktrace_x86_64-inl.h" # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 # define STACKTRACE_H "stacktrace_powerpc-inl.h" +# elif defined(OS_WINDOWS) +# define STACKTRACE_H "stacktrace_windows-inl.h" # endif #endif @@ -121,13 +127,18 @@ # define HAVE_STACKTRACE #endif +#ifndef HAVE_SYMBOLIZE // defined by gcc #if defined(__ELF__) && defined(OS_LINUX) # define HAVE_SYMBOLIZE #elif defined(OS_MACOSX) && defined(HAVE_DLADDR) // Use dladdr to symbolize. # define HAVE_SYMBOLIZE +#elif defined(OS_WINDOWS) +// Use DbgHelp to symbolize +# define HAVE_SYMBOLIZE #endif +#endif // !defined(HAVE_SYMBOLIZE) #ifndef ARRAYSIZE // There is a better way, but this is good enough for our purpose. @@ -141,6 +152,9 @@ namespace glog_internal_namespace_ { #ifdef HAVE___ATTRIBUTE__ # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) # define HAVE_ATTRIBUTE_NOINLINE +#elif defined(OS_WINDOWS) +# define ATTRIBUTE_NOINLINE __declspec(noinline) +# define HAVE_ATTRIBUTE_NOINLINE #else # define ATTRIBUTE_NOINLINE #endif |