Merge lp:~zorba-coders/zorba/bug-963091 into lp:zorba

Proposed by Matthias Brantner
Status: Merged
Approved by: Chris Hillery
Approved revision: 10731
Merged at revision: 10737
Proposed branch: lp:~zorba-coders/zorba/bug-963091
Merge into: lp:zorba
Diff against target: 27 lines (+6/-0)
2 files modified
bin/debugger/main.cpp (+2/-0)
bin/debugger/process_listener.cpp (+4/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-963091
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+99183@code.launchpad.net

Commit message

fix for bug #963091 (Zorba 2.2.0 fails to build with gcc 4.7)

Description of the change

fix for bug #963091 (Zorba 2.2.0 fails to build with gcc 4.7); patch accepted as suggested

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-963091-2012-03-24T19-41-54.611Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-963091-2012-03-28T16-20-06.857Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/debugger/main.cpp'
2--- bin/debugger/main.cpp 2012-03-23 17:32:07 +0000
3+++ bin/debugger/main.cpp 2012-03-24 19:40:26 +0000
4@@ -18,6 +18,8 @@
5 # include <windows.h>
6 # include <string.h>
7 # include <strsafe.h>
8+#else
9+#include <unistd.h>
10 #endif
11
12 #include <vector>
13
14=== modified file 'bin/debugger/process_listener.cpp'
15--- bin/debugger/process_listener.cpp 2012-03-23 17:32:07 +0000
16+++ bin/debugger/process_listener.cpp 2012-03-24 19:40:26 +0000
17@@ -18,6 +18,10 @@
18
19 #include <iostream>
20
21+#ifndef WIN32
22+#include <unistd.h>
23+#endif
24+
25 #ifdef ZORBA_HAVE_PTHREAD_H
26 # include <cassert>
27 #endif

Subscribers

People subscribed via source and target branches