summaryrefslogtreecommitdiff
path: root/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-04 22:21:30 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-04 22:21:30 +0100
commitbb9efd268326393ca769c38e6385216569e70e52 (patch)
treee3871fe2dcc5134c94d7ebd14c424beb59efa6a6 /package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
parent9df044766604b62242545c325ad2cdb31848057a (diff)
update firefox and dependencies
Diffstat (limited to 'package/firefox/patches/patch-ipc_chromium_src_base_file_util_h')
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_file_util_h21
1 files changed, 4 insertions, 17 deletions
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
index 137efacd8..5f7e30a10 100644
--- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
@@ -1,23 +1,10 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.h 2013-10-23 16:28:38.000000000 +0200
-@@ -16,7 +16,11 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util.h 2014-01-02 15:01:42.000000000 +0100
+@@ -16,7 +16,6 @@
#include <sys/stat.h>
#elif defined(OS_POSIX)
#include <sys/types.h>
-+#ifndef __GLIBC__
-+#define NO_FTS
-+#else
- #include <fts.h>
-+#endif
+-#include <fts.h>
#include <sys/stat.h>
#endif
-@@ -466,7 +470,7 @@ class FileEnumerator {
- #if defined(OS_WIN)
- WIN32_FIND_DATA find_data_;
- HANDLE find_handle_;
--#elif defined(ANDROID)
-+#elif defined(NO_FTS)
- void *fts_;
- #elif defined(OS_POSIX)
- FTS* fts_;