zorba-coders team mailing list archive

[Gabriel Petrovay <gabipetrovay@xxxxxxxxx>]

Gabriel Petrovay has proposed merging lp:~zorba-coders/zorba/debugger_broken_mac_build into lp:zorba.

Requested reviews:
  Gabriel Petrovay (gabipetrovay)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/debugger_broken_mac_build/+merge/87469

Fixes the two problems on mac that break the build:
- usage of wait() without parameters
- moved the "sys/wait" include in "process_listener.h" since that uses pid_t that is available once this header is included.
-- 
https://code.launchpad.net/~zorba-coders/zorba/debugger_broken_mac_build/+merge/87469
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/debugger/main.cpp'
--- bin/debugger/main.cpp	2012-01-03 12:10:06 +0000
+++ bin/debugger/main.cpp	2012-01-04 13:05:28 +0000
@@ -378,7 +378,8 @@
     //tCommandLineHandler.execute();
 
 #ifndef WIN32
-    wait();
+    int lStatus;
+    wait(&lStatus);
 #endif
 
     delete theClient;

=== modified file 'bin/debugger/process_listener.cpp'
--- bin/debugger/process_listener.cpp	2012-01-03 12:10:06 +0000
+++ bin/debugger/process_listener.cpp	2012-01-04 13:05:28 +0000
@@ -19,7 +19,6 @@
 #include <iostream>
 
 #ifdef ZORBA_HAVE_PTHREAD_H
-# include <sys/wait.h>
 # include <cassert>
 #endif
 

=== modified file 'bin/debugger/process_listener.h'
--- bin/debugger/process_listener.h	2012-01-03 12:10:06 +0000
+++ bin/debugger/process_listener.h	2012-01-04 13:05:28 +0000
@@ -21,6 +21,7 @@
 
 #ifdef ZORBA_HAVE_PTHREAD_H
 # include <pthread.h>
+# include <sys/wait.h>
   typedef pthread_t ThreadId;
   typedef pid_t ProcessId;
   typedef int ExitCode;