From: Ryan Norton <wxprojects@comcast.net>
Date: Fri, 8 Oct 2004 00:08:33 +0000 (+0000)
Subject: wxCocoa link fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/51678b5b7639f756379245156b49dd54d7e28368?ds=sidebyside;hp=8a9c20b016d88b85db8a1f564a2249057db0ca77

wxCocoa link fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h
index 9bb61aedd5..225a4c188b 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__) && defined(__WXMAC__)
+#if defined(__DARWIN__)
 // 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 2c375b2edb..5455080fe0 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1143,7 +1143,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
     }
 
 
-#if defined(__DARWIN__) && defined(__WXMAC__)
+#if defined(__DARWIN__)
     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__) && defined(__WXMAC__)
+#endif // defined(__DARWIN__)
 
     if ( execData.flags & wxEXEC_SYNC )
     {