From f48ba7b74c94b4cf0d8c0b30856953e33ecf136d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 8 Mar 2009 19:13:45 +0000 Subject: [PATCH] add some explicit llvm:: qualifiers to the unix side, fix problems on the windows side. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66386 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Signals.inc | 9 +++++---- lib/System/Win32/Signals.inc | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc index 94f6b6c4a39..e031e85b425 100644 --- a/lib/System/Unix/Signals.inc +++ b/lib/System/Unix/Signals.inc @@ -101,13 +101,14 @@ static void RegisterHandler(int Signal) { } -void sys::SetInterruptFunction(void (*IF)()) { +void llvm::sys::SetInterruptFunction(void (*IF)()) { InterruptFunction = IF; RegisterHandler(SIGINT); } // RemoveFileOnSignal - The public API -bool sys::RemoveFileOnSignal(const sys::Path &Filename, std::string* ErrMsg) { +bool llvm::sys::RemoveFileOnSignal(const sys::Path &Filename, + std::string* ErrMsg) { if (FilesToRemove == 0) FilesToRemove = new std::vector(); @@ -121,7 +122,7 @@ bool sys::RemoveFileOnSignal(const sys::Path &Filename, std::string* ErrMsg) { /// 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)); @@ -187,7 +188,7 @@ static void PrintStackTrace(void *) { /// PrintStackTraceOnErrorSignal - When an error signal (such as SIBABRT or /// SIGSEGV) is delivered to the process, print a stack trace and then exit. -void sys::PrintStackTraceOnErrorSignal() { +void llvm::sys::PrintStackTraceOnErrorSignal() { AddSignalHandler(PrintStackTrace, 0); } diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc index da9fd502a7e..9276ef41a0b 100644 --- a/lib/System/Win32/Signals.inc +++ b/lib/System/Win32/Signals.inc @@ -259,10 +259,10 @@ static BOOL WINAPI LLVMConsoleCtrlHandler(DWORD dwCtrlType) { /// 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)); - std::for_each(KillSigs, KillSigsEnd, RegisterHandler); + RegisterHandler(); } -- 2.34.1