From: Benjamin Kramer Date: Wed, 11 Mar 2015 16:09:02 +0000 (+0000) Subject: Wrap in __MINGW32__ to avoid warnings from msvc. X-Git-Tag: android-x86-7.1-r4~50548 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2175eac14143b852b856d0a0e2f5c575bc5ae0db;p=android-x86%2Fexternal-llvm.git Wrap in __MINGW32__ to avoid warnings from msvc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231933 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/Windows/Signals.inc b/lib/Support/Windows/Signals.inc index 112e40ea287..e03a1756c68 100644 --- a/lib/Support/Windows/Signals.inc +++ b/lib/Support/Windows/Signals.inc @@ -387,8 +387,10 @@ void sys::PrintStackTraceOnErrorSignal() { } } +#ifdef __MINGW32__ // Provide a prototype for RtlCaptureContext, mingw32 is missing it. extern "C" VOID WINAPI RtlCaptureContext(PCONTEXT ContextRecord); +#endif void llvm::sys::PrintStackTrace(raw_ostream &OS) { @@ -422,7 +424,7 @@ void llvm::sys::SetInterruptFunction(void (*IF)()) { /// AddSignalHandler - Add a function to be called when a signal is delivered /// to the process. The handler can have a cookie passed to it to identify /// what instance of the handler it is. -void sys::AddSignalHandler(void (*FnPtr)(void *), void *Cookie) { +void llvm::sys::AddSignalHandler(void (*FnPtr)(void *), void *Cookie) { if (CallBacksToRun == 0) CallBacksToRun = new std::vector >(); CallBacksToRun->push_back(std::make_pair(FnPtr, Cookie));