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 9bb61aedd554bcadf6ddf5cd4a4489a5fedd00f5..225a4c188bdb774fd4e9148487ae6e2be84f02d3 100644 (file)
--- 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);
 
 // 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
 // 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 2c375b2edbae6785d1a2d5f0eedea49edd746f43..5455080fe0ef27adeb6f5dd42f4690cc98066d84 100644 (file)
--- 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
     endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
 #else
     endProcData->tag = wxAddProcessCallback


@@ -1153,7 +1153,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
                 );
 
     execData.pipeEndProcDetect.Close();
                 );
 
     execData.pipeEndProcDetect.Close();

-#endif // defined(__DARWIN__) && defined(__WXMAC__)
+#endif // defined(__DARWIN__)

 
     if ( execData.flags & wxEXEC_SYNC )
     {
 
     if ( execData.flags & wxEXEC_SYNC )
     {