Merge lp:~zorba-coders/zorba/debugger_broken_mac_build into lp:zorba

[Gabriel Petrovay]

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.

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.

[Gabriel Petrovay (gabipetrovay)]

review: Approve

[Paul J. Lucas (paul-lucas)]

Should you check the result of "lStatus"?

[Gabriel Petrovay (gabipetrovay)]

I want to quit, whatever the status is. What would be the solution in this case?

[Paul J. Lucas (paul-lucas)]

If you just want to quit, then it doesn't matter what the status is. But if you just want to quit, why do you need to wait() at all?

[Gabriel Petrovay (gabipetrovay)]

The main process would exit and you get a console prompt even though the zorba debugger did not finish.

[Paul J. Lucas (paul-lucas)]

You get a console prompt on a non-Windows platform?? If not, then just #ifdef out the wait completely on Mac/Linux.

[lp:~zorba-coders/zorba/debugger_broken_mac_build]

10601. By Gabriel Petrovay on 2012-01-04

removed wait call on non-Windows

[Paul J. Lucas (paul-lucas)]

review: Approve

Unmerged revisions

=== modified file 'bin/debugger/main.cpp'
--- bin/debugger/main.cpp	2012-01-03 12:10:06 +0000
+++ bin/debugger/main.cpp	2012-01-04 16:37:06 +0000
@@ -214,10 +214,7 @@
       return pID;
     }
     
-    // pID > 0
-
     // Watch the process
-    //ProcessListener* lPl =
     new ProcessListener(pID, &onExitProcess);
 
     return 0;
@@ -375,12 +372,6 @@
     theClient =  new XqdbClient(lPort);
     theClient->start();
 
-    //tCommandLineHandler.execute();
-
-#ifndef WIN32
-    wait();
-#endif
-
     delete theClient;
 
   } catch (...) {

=== 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 16:37:06 +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 16:37:06 +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;