From owner-freebsd-gecko@FreeBSD.ORG Tue Nov 22 01:28:49 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CE10106564A for ; Tue, 22 Nov 2011 01:28:49 +0000 (UTC) (envelope-from jbeich@tormail.net) Received: from server2.hudsonvalleyhost.com (server2.hudsonvalleyhost.com [66.7.195.77]) by mx1.freebsd.org (Postfix) with ESMTP id BAE9A8FC17 for ; Tue, 22 Nov 2011 01:28:48 +0000 (UTC) Received: from tor3.anonymizer.ccc.de ([80.237.226.73]:43049 helo=internal.tormail.net) by server2.hudsonvalleyhost.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.69) (envelope-from ) id 1RSebl-003xnl-Jv for freebsd-gecko@freebsd.org; Mon, 21 Nov 2011 19:53:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.net; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:To:From; bh=0L6ZAtcZohjP2fW4sd0ZovjSeKyzq3yT5mAoJkgHgqw=; b=ml/Palyypa/7q0yId7g1i7CP3ZORVTCdiieBJCoWuwFigUKRUuFt6WOhOpGuHxz54z2eUB1wJ9cdML9u36SpnDnYCft75DWM8/aj25NWZfNhKT02TmLbr5Z8qhhaqHhrfyqsYp6nugBhlqAUoWHtnqAzNnUs7XD+dfaX+AnVtIk=; Received: from jbeich by internal.tormail.net with local (Exim 4.63) (envelope-from ) id 1RSebb-000Ks7-3y for freebsd-gecko@freebsd.org; Tue, 22 Nov 2011 00:53:00 +0000 From: Jan Beich To: freebsd-gecko@freebsd.org In-Reply-To: <201111220004.pAM04d3X005691@trillian.chruetertee.ch> (svn-freebsd-gecko@chruetertee.ch's message of "Tue, 22 Nov 2011 00:04:39 GMT") Date: Mon, 21 Nov 2011 13:52:03 -1100 References: <201111220004.pAM04d3X005691@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1RSebb-000Ks7-3y@internal.tormail.net> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.hudsonvalleyhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.net X-Source: X-Source-Args: X-Source-Dir: Subject: Re: [SVN-Commit] r676 - in branches/experimental/www/firefox-beta: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Nov 2011 01:28:49 -0000 svn-freebsd-gecko@chruetertee.ch writes: > Log: > update to 9.0b2 [...] > +--- 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 @@ > + if (offset_ != size_) > + return true; > + > +- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); > ++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_)); > + if (r == 0) > + return false; > + if (r == -1) { Does it work with plugins (e.g. flash)? Field offsets are different // offsetof() .d_reclen (linux_dirent) = 16 .d_name (linux_dirent) = 19 .d_reclen (dirent) = 4 .d_name (dirent) = 8 --- ipc/chromium/src/base/dir_reader_linux.h~ +++ ipc/chromium/src/base/dir_reader_linux.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -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; - const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); + const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_)); if (r == 0) return false; if (r == -1) {