← Back to team overview

zorba-coders team mailing list archive

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

 

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

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Martin Gieseking (martin-gieseking)
Related bugs:
  Bug #911956 in Zorba: "Zorba fails to build with gcc 4.7.0"
  https://bugs.launchpad.net/zorba/+bug/911956

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

fixed build for gcc 4.7.x (fixes bug #911956). Something is wrong with launchpad and preceding proposals. Hence, I'm trying to propose again.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug911956/+merge/87545
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/unit/datetime.cpp'
--- test/unit/datetime.cpp	2011-06-14 17:26:33 +0000
+++ test/unit/datetime.cpp	2012-01-04 23:06: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>


Follow ups