| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- --- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc 2013-12-05 17:07:35.000000000 +0100
- +++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc 2014-01-02 14:53:44.000000000 +0100
- @@ -8,13 +8,16 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fnmatch.h>
- -#ifndef ANDROID
- +#ifndef __GLIBC__
- +#define NO_FTS
- +#endif
- +#ifndef NO_FTS
- #include <fts.h>
- #endif
- #include <libgen.h>
- #include <stdio.h>
- #include <string.h>
- -#include <sys/errno.h>
- +#include <errno.h>
- #include <sys/mman.h>
- #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
- #include <sys/stat.h>
- @@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r
- if (!recursive)
- return (rmdir(path_str) == 0);
-
- -#ifdef ANDROID
- +#ifdef NO_FTS
- // XXX Need ftsless impl for bionic
- return false;
- #else
- @@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_
- return false;
- }
-
- -#ifdef ANDROID
- +#ifdef NO_FTS
- // XXX Need ftsless impl for bionic
- return false;
- #else
- @@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa
- return false;
- tmpdir = tmpdir.Append(kTempFileName);
- std::string tmpdir_string = tmpdir.value();
- -#ifdef ANDROID
- +#ifdef NO_FTS
- char* dtemp = NULL;
- #else
- // this should be OK since mkdtemp just replaces characters in place
|
