diff --git a/security/sandbox/chromium/base/location.cc b/security/sandbox/chromium/base/location.cc index 6d7a565604c..b5da027ee82 100644 --- a/security/sandbox/chromium/base/location.cc +++ b/security/sandbox/chromium/base/location.cc @@ -5,7 +5,10 @@ #include "build/build_config.h" #if defined(COMPILER_MSVC) -#include +// MSDN says to #include , but that breaks the VS2005 build. +extern "C" { + void* _ReturnAddress(); +} #endif #include "base/location.h" diff --git a/security/sandbox/chromium/base/win/scoped_handle.h b/security/sandbox/chromium/base/win/scoped_handle.h index 21240149606..d236a70beb4 100644 --- a/security/sandbox/chromium/base/win/scoped_handle.h +++ b/security/sandbox/chromium/base/win/scoped_handle.h @@ -18,7 +18,10 @@ namespace win { // TODO(rvargas): remove this with the rest of the verifier. #if defined(COMPILER_MSVC) -#include +// MSDN says to #include , but that breaks the VS2005 build. +extern "C" { + void* _ReturnAddress(); +} #define BASE_WIN_GET_CALLER _ReturnAddress() #elif defined(COMPILER_GCC) #define BASE_WIN_GET_CALLER __builtin_extract_return_addr(\\