diff --git a/CodeLite/asyncprocess.cpp b/CodeLite/asyncprocess.cpp index 60936e0e6b..3a8ee5fa52 100644 --- a/CodeLite/asyncprocess.cpp +++ b/CodeLite/asyncprocess.cpp @@ -9,10 +9,6 @@ class IProcess; # include "unixprocess_impl.h" #endif -// statics -wxCriticalSection IProcess::m_cs; -std::map IProcess::m_exitCodeMap; - IProcess* CreateAsyncProcess(wxEvtHandler *parent, const wxString& cmd, IProcessCreateFlags flags, const wxString &workingDir) { #ifdef __WXMSW__ @@ -26,19 +22,15 @@ IProcess* CreateAsyncProcess(wxEvtHandler *parent, const wxString& cmd, IProcess // Static methods: bool IProcess::GetProcessExitCode(int pid, int &exitCode) { - wxCriticalSectionLocker locker(m_cs); - - std::map::iterator iter = m_exitCodeMap.find(pid); - if(iter == m_exitCodeMap.end()) { - return false; - } - exitCode = iter->second; + wxUnusedVar(pid); + wxUnusedVar(exitCode); + + exitCode = 0; return true; } void IProcess::SetProcessExitCode(int pid, int exitCode) { - wxCriticalSectionLocker locker(m_cs); - m_exitCodeMap[pid] = exitCode; + wxUnusedVar(pid); + wxUnusedVar(exitCode); } - diff --git a/CodeLite/asyncprocess.h b/CodeLite/asyncprocess.h index 026874d138..5b139f740b 100644 --- a/CodeLite/asyncprocess.h +++ b/CodeLite/asyncprocess.h @@ -50,8 +50,6 @@ class WXDLLIMPEXP_CL IProcess wxEvtHandler * m_parent; int m_pid; bool m_hardKill; - static std::map m_exitCodeMap; - static wxCriticalSection m_cs; public: IProcess(wxEvtHandler *parent) : m_parent(parent), m_pid(-1), m_hardKill(false) {} diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp index 982d5112ef..02119e7369 100644 --- a/LiteEditor/app.cpp +++ b/LiteEditor/app.cpp @@ -217,7 +217,7 @@ static void ChildTerminatedSingalHandler(int signo) if(pid > 0) { // waitpid succeeded IProcess::SetProcessExitCode(pid, WEXITSTATUS(status)); - + } else { break; @@ -423,10 +423,14 @@ bool CodeLiteApp::OnInit() // set the CTAGS_REPLACEMENT environment variable wxSetEnv(wxT("CTAGS_REPLACEMENTS"), ManagerST::Get()->GetStarupDirectory() + wxT("/ctags.replacements")); - //show splashscreen here + // show splashscreen here long style = wxSIMPLE_BORDER; #if defined (__WXMSW__) || defined (__WXGTK__) style |= wxFRAME_NO_TASKBAR; + +#else // Mac + wxUnusedVar(style); + #endif //read the last frame size from the configuration file