[SVN-Commit] r677 - branches/experimental/www/firefox-beta/files

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Tue Nov 22 08:50:12 2011
New Revision: 677

Log:
Due to different field offsets the previous patch was not complete. Plugins
like Flash would hang. This patch fixes that.

Submitted by:	Jan Beich <jbeich at tormail.net>

Modified:
   branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h

Modified: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h	Tue Nov 22 00:04:38 2011	(r676)
+++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h	Tue Nov 22 08:50:12 2011	(r677)
@@ -1,6 +1,31 @@
 --- ipc/chromium/src/base/dir_reader_linux.h.orig	2011-11-21 23:40:06.000000000 +0100
 +++ ipc/chromium/src/base/dir_reader_linux.h	2011-11-21 23:40:26.000000000 +0100
-@@ -57,7 +57,7 @@
+@@ -9,6 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <sys/dirent.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
+@@ -19,6 +20,8 @@
+ 
+ namespace base {
+ 
++#define linux_dirent struct dirent
++#if 0
+ struct linux_dirent {
+   uint64_t        d_ino;
+   int64_t         d_off;
+@@ -26,6 +29,7 @@ struct linux_dirent {
+   unsigned char   d_type;
+   char            d_name[0];
+ };
++#endif
+ 
+ class DirReaderLinux {
+  public:
+@@ -57,7 +61,7 @@ class DirReaderLinux {
      if (offset_ != size_)
        return true;