zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-963091 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #963091 in Zorba: "Zorba 2.2.0 fails to build with gcc 4.7 (missing includes)"
  https://bugs.launchpad.net/zorba/+bug/963091

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-963091/+merge/99183

fix for bug #963091 (Zorba 2.2.0 fails to build with gcc 4.7); patch accepted as suggested
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-963091/+merge/99183
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/debugger/main.cpp'
--- bin/debugger/main.cpp	2012-03-23 17:32:07 +0000
+++ bin/debugger/main.cpp	2012-03-24 19:40:26 +0000
@@ -18,6 +18,8 @@
 # include <windows.h>
 # include <string.h>
 # include <strsafe.h>
+#else
+#include <unistd.h>
 #endif
 
 #include <vector>

=== modified file 'bin/debugger/process_listener.cpp'
--- bin/debugger/process_listener.cpp	2012-03-23 17:32:07 +0000
+++ bin/debugger/process_listener.cpp	2012-03-24 19:40:26 +0000
@@ -18,6 +18,10 @@
 
 #include <iostream>
 
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
 #ifdef ZORBA_HAVE_PTHREAD_H
 # include <cassert>
 #endif