diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /ipc/chromium/src/base/dir_reader_linux.h | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'ipc/chromium/src/base/dir_reader_linux.h')
| -rw-r--r-- | ipc/chromium/src/base/dir_reader_linux.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipc/chromium/src/base/dir_reader_linux.h b/ipc/chromium/src/base/dir_reader_linux.h index 530fe2e01..e0466fc4c 100644 --- a/ipc/chromium/src/base/dir_reader_linux.h +++ b/ipc/chromium/src/base/dir_reader_linux.h @@ -90,7 +90,10 @@ class DirReaderLinux { private: const int fd_; - unsigned char buf_[512]; + union { + linux_dirent dirent_; + unsigned char buf_[512]; + }; size_t offset_, size_; DISALLOW_COPY_AND_ASSIGN(DirReaderLinux); |