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

[Matthias Brantner]

fixed build for gcc 4.7.x (fixes bug #911956)

fixed build for gcc 4.7.x (fixes bug #911956)

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug911956-2012-01-04T20-23-03.043Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug911956-2012-01-04T20-23-03.043Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

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

[Martin Gieseking (martin-gieseking)]

Since most Windows compilers don't provide unistd.h, I suggest to use my patch attached to the bug report which excludes the header file from Windows builds. This shouldn't be a problem as the prototype of sleep() included by unistd.h is defined separately in the patched source file.

review: Needs Information

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

10602. By Matthias Brantner on 2012-01-04

unistd.h is not available on most Windows compilers

Unmerged revisions

=== modified file 'test/unit/datetime.cpp'
--- test/unit/datetime.cpp	2011-06-14 17:26:33 +0000
+++ test/unit/datetime.cpp	2012-01-04 21:39:42 +0000
@@ -21,6 +21,8 @@
 #ifdef WIN32
 # include <windows.h>
 # define sleep(s) Sleep(s*1000)
+#else
+# include <unistd.h>
 #endif
 
 #include <zorba/store_manager.h>