Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 39 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-base_files_dir__reader__linux.h b/devel/electron39/files/patch-base_files_dir__reader__linux.h
new file mode 100644
index 000000000000..79633108cfdb
--- /dev/null
+++ b/devel/electron39/files/patch-base_files_dir__reader__linux.h
@@ -0,0 +1,39 @@
+--- base/files/dir_reader_linux.h.orig	2025-03-24 20:50:14 UTC
++++ base/files/dir_reader_linux.h
+@@ -21,10 +21,16 @@
+ #include "base/logging.h"
+ #include "base/posix/eintr_wrapper.h"
+ 
++#include "build/build_config.h"
++
+ // See the comments in dir_reader_posix.h about this.
+ 
+ namespace base {
+ 
++#if BUILDFLAG(IS_BSD)
++#include <dirent.h>
++typedef struct dirent linux_dirent;
++#else
+ struct linux_dirent {
+   uint64_t d_ino;
+   int64_t d_off;
+@@ -32,6 +38,7 @@ struct linux_dirent {
+   unsigned char d_type;
+   char d_name[0];
+ };
++#endif
+ 
+ class DirReaderLinux {
+  public:
+@@ -66,7 +73,11 @@ class DirReaderLinux {
+       return true;
+     }
+ 
++#if BUILDFLAG(IS_BSD)
++    const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
++#else
+     const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++#endif
+     if (r == 0) {
+       return false;
+     }