diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
commit | 2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch) | |
tree | 1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/firefox/patches/patch-ipc_chromium_src_base_file_util_h | |
parent | 45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff) | |
parent | 667bc9e981847a1d117a2fc7110948075a268bdd (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
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_h | 21 |
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_; |