From f7ef06022c3796159e917c7aa0ec47c3ec45c586 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Sun, 24 Oct 2004 07:36:16 +0000 Subject: [PATCH] Fix wxExecute for ports other than wxMac and wxCocoa on Darwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/execute.h | 2 +- src/unix/utilsunx.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h index 225a4c188b..745674ec60 100644 --- a/include/wx/unix/execute.h +++ b/include/wx/unix/execute.h @@ -71,7 +71,7 @@ extern void wxHandleProcessTermination(wxEndProcessData *proc_data); // child process. The return valus is port-specific. extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd); -#if defined(__DARWIN__) +#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) // For ports (e.g. DARWIN) which can add callbacks based on the pid extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid); #endif diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 5455080fe0..6169570d98 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1143,7 +1143,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) } -#if defined(__DARWIN__) +#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); #else endProcData->tag = wxAddProcessCallback @@ -1153,7 +1153,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) ); execData.pipeEndProcDetect.Close(); -#endif // defined(__DARWIN__) +#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) if ( execData.flags & wxEXEC_SYNC ) {