widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/freebsd-unlink into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/freebsd-unlink/+merge/226905

Hello again :)

So after a bit back and forth, my freebsd-branch was merged and everything was working. Well, except that latest trunk failed to build on FreeBSD. Specifically src/io/filesystem/disk_filesystem.cc failed to find unlink().

I'm not quite sure how this broke it, but I noticed that the most recent change in this directory was removing the usage of boost/noncopyable [1]. After re-adding this include, it built fine again. Of course this wasn't going to be a permanent solution, so I looked around a bit and found unistd.h which contains unlink(). After including this, it now builds again.

I wonder whether the include should be moved down among the "only-include-when-not-on-Windows" includes though.

[1] http://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/7088#src/io/filesystem/filesystem.h
-- 
https://code.launchpad.net/~hjd/widelands/freebsd-unlink/+merge/226905
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/freebsd-unlink into lp:widelands.

=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc	2014-07-14 10:45:44 +0000
+++ src/io/filesystem/disk_filesystem.cc	2014-07-15 19:28:51 +0000
@@ -23,6 +23,7 @@
 #include <cerrno>
 
 #include <sys/stat.h>
+#include <unistd.h>
 
 #ifdef _WIN32
 #include <dos.h>