Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85251 - branches/release/libs/filesystem/src
From: antoshkka_at_[hidden]
Date: 2013-08-09 05:29:39


Author: apolukhin
Date: 2013-08-09 05:29:39 EDT (Fri, 09 Aug 2013)
New Revision: 85251
URL: http://svn.boost.org/trac/boost/changeset/85251

Log:
Merge from trunk: fix for Android compilation of Boost.Filesystem (fixes #8706)

Text files modified:
   branches/release/libs/filesystem/src/operations.cpp | 4 +++-
   1 files changed, 3 insertions(+), 1 deletions(-)

Modified: branches/release/libs/filesystem/src/operations.cpp
==============================================================================
--- branches/release/libs/filesystem/src/operations.cpp Fri Aug 9 05:18:27 2013 (r85250)
+++ branches/release/libs/filesystem/src/operations.cpp 2013-08-09 05:29:39 EDT (Fri, 09 Aug 2013) (r85251)
@@ -73,13 +73,15 @@
     const fs::path dot_dot_path("..");
 # include <sys/types.h>
 # include <sys/stat.h>
-# if !defined(__APPLE__) && !defined(__OpenBSD__)
+# if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__ANDROID__)
 # include <sys/statvfs.h>
 # define BOOST_STATVFS statvfs
 # define BOOST_STATVFS_F_FRSIZE vfs.f_frsize
 # else
 # ifdef __OpenBSD__
 # include <sys/param.h>
+# elif defined(__ANDROID__)
+# include <sys/vfs.h>
 # endif
 # include <sys/mount.h>
 # define BOOST_STATVFS statfs


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk