56 lines
1.1 KiB
Diff
56 lines
1.1 KiB
Diff
|
--- ipc/chromium/src/base/file_util.h
|
||
|
|
+++ ipc/chromium/src/base/file_util.h
|
||
|
|
@@ -14,10 +14,15 @@
|
||
|
|
#include <windows.h>
|
||
|
|
#elif defined(ANDROID)
|
||
|
|
#include <sys/stat.h>
|
||
|
|
+#define NO_FTS
|
||
|
|
#elif defined(OS_POSIX)
|
||
|
|
#include <sys/types.h>
|
||
|
|
-#include <fts.h>
|
||
|
|
#include <sys/stat.h>
|
||
|
|
+#ifdef __GLIBC__
|
||
|
|
+#include <fts.h>
|
||
|
|
+#else
|
||
|
|
+#define NO_FTS
|
||
|
|
+#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
--- ipc/chromium/src/base/file_util_posix.cc
|
||
|
|
+++ ipc/chromium/src/base/file_util_posix.cc
|
||
|
|
@@ -8,13 +8,13 @@
|
||
|
|
#include <errno.h>
|
||
|
|
#include <fcntl.h>
|
||
|
|
#include <fnmatch.h>
|
||
|
|
-#ifndef ANDROID
|
||
|
|
+#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 +67,7 @@
|
||
|
|
if (!recursive)
|
||
|
|
return (rmdir(path_str) == 0);
|
||
|
|
|
||
|
|
-#ifdef ANDROID
|
||
|
|
+#ifdef NO_FTS
|
||
|
|
// XXX Need ftsless impl for bionic
|
||
|
|
return false;
|
||
|
|
#else
|
||
|
|
@@ -140,7 +140,7 @@
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
-#ifdef ANDROID
|
||
|
|
+#ifdef NO_FTS
|
||
|
|
// XXX Need ftsless impl for bionic
|
||
|
|
return false;
|
||
|
|
#else
|