1 files changed, 7 insertions, 44 deletions
diff --git a/main/xulrunner/fix-ipc.patch b/main/xulrunner/fix-ipc.patch
index 98590c9a02..e21d57f40d 100644
--- a/main/xulrunner/fix-ipc.patch
+++ b/main/xulrunner/fix-ipc.patch
@@ -1,4 +1,4 @@
---- mozilla-release/ipc.orig/chromium/src/base/debug_util_posix.cc
+--- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc
 +++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
@@ -9,9 +9,9 @@
  
  #include <errno.h>
  #include <fcntl.h>
---- mozilla-release/ipc.orig/chromium/src/base/file_util.h
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.h
 +++ mozilla-release/ipc/chromium/src/base/file_util.h
-@@ -14,11 +14,16 @@
+@@ -14,10 +14,15 @@
  #include <windows.h>
  #elif defined(ANDROID)
  #include <sys/stat.h>
@@ -24,21 +24,11 @@
 +#include <fts.h>
 +#else
 +#define NO_FTS
- #endif
 +#endif
+ #endif
  
  #include <stdio.h>
- 
-@@ -466,7 +471,7 @@
- #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_;
---- mozilla-release/ipc.orig/chromium/src/base/file_util_posix.cc
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc
 +++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc
 @@ -8,13 +8,13 @@
  #include <errno.h>
@@ -56,7 +46,7 @@
  #include <sys/mman.h>
  #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
  #include <sys/stat.h>
-@@ -121,7 +121,7 @@
+@@ -67,7 +67,7 @@
    if (!recursive)
      return (rmdir(path_str) == 0);
  
@@ -65,7 +55,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -194,7 +194,7 @@
+@@ -140,7 +140,7 @@
      return false;
    }
  
@@ -74,30 +64,3 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -613,7 +613,7 @@
- }
- 
- FileEnumerator::~FileEnumerator() {
--#ifndef ANDROID
-+#ifndef NO_FTS
-   if (fts_)
-     fts_close(fts_);
- #endif
-@@ -625,7 +625,7 @@
-   if (!is_in_find_op_)
-     return;
- 
--#ifndef ANDROID
-+#ifndef NO_FTS
-   memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat));
-   info->filename.assign(fts_ent_->fts_name);
- #endif
-@@ -636,7 +636,7 @@
- // large directories with many files this can be quite deep.
- // TODO(erikkay) - get rid of this recursive pattern
- FilePath FileEnumerator::Next() {
--#ifdef ANDROID
-+#ifdef NO_FTS
-   return FilePath();
- #else
-   if (!is_in_find_op_) {