Update per comment.

Author: python3kgae

extension/data_loader/file_data_loader.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/extension/data_loader/file.h>
+#include <executorch/extension/data_loader/pread.h>
 #include <executorch/extension/data_loader/file_data_loader.h>
 
 #include <algorithm>

extension/data_loader/file.h extension/data_loader/pread.hextension/data_loader/file.h renamed to extension/data_loader/pread.h

@@ -6,6 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// This file ensures that a pread-compatible function is defined in the global namespace for windows and posix environments.
+
 #pragma once
 
 #ifndef _WIN32
@@ -15,18 +17,21 @@
 #include <io.h>
 
 #include <windows.h>
+// To avoid conflicts with std::numeric_limits<int32_t>::max() in
+// file_data_loader.cpp.
+#undef max
 
-inline ssize_t pread(int __fd, void* __buf, size_t __nbytes, size_t __offset) {
+inline ssize_t pread(int fd, void* buf, size_t nbytes, size_t offset) {
   OVERLAPPED overlapped; /* The offset for ReadFile. */
   memset(&overlapped, 0, sizeof(overlapped));
-  overlapped.Offset = __offset;
-  overlapped.OffsetHigh = __offset >> 32;
+  overlapped.Offset = offset;
+  overlapped.OffsetHigh = offset >> 32;
 
   BOOL result; /* The result of ReadFile. */
   DWORD bytes_read; /* The number of bytes read. */
-  HANDLE file = (HANDLE)_get_osfhandle(__fd);
+  HANDLE file = (HANDLE)_get_osfhandle(fd);
 
-  result = ReadFile(file, __buf, __nbytes, &bytes_read, &overlapped);
+  result = ReadFile(file, buf, nbytes, &bytes_read, &overlapped);
   DWORD error = GetLastError();
   if (!result) {
     if (error == ERROR_IO_PENDING) {
@@ -51,7 +56,4 @@ inline ssize_t pread(int __fd, void* __buf, size_t __nbytes, size_t __offset) {
   return bytes_read;
 }
 
-// To avoid conflicts with std::numeric_limits<int32_t>::max() in
-// file_data_loader.cpp.
-#undef max
 #endif

extension/data_loader/targets.bzl

@@ -40,7 +40,7 @@ def define_common_targets():
     runtime.cxx_library(
         name = "file_data_loader",
         srcs = ["file_data_loader.cpp"],
-        headers = ["file.h"],
+        headers = ["pread.h"],
         exported_headers = ["file_data_loader.h"],
         visibility = [
             "//executorch/test/...",