Use single file.h

Author: python3kgae

CMakeLists.txt

@@ -785,11 +785,6 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
   endif()
 
   add_executable(executor_runner ${_executor_runner__srcs})
-  if(WIN32)
-    target_include_directories(executor_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader/Windows)
-  else()
-    target_include_directories(executor_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader/Unix)
-  endif()
   if(CMAKE_BUILD_TYPE STREQUAL "Release")
     if(APPLE)
       target_link_options(executor_runner PRIVATE "LINKER:-dead_strip")

extension/data_loader/CMakeLists.txt

@@ -20,11 +20,6 @@ list(TRANSFORM _extension_data_loader__srcs PREPEND "${EXECUTORCH_ROOT}/")
 add_library(extension_data_loader ${_extension_data_loader__srcs})
 target_link_libraries(extension_data_loader executorch)
 target_include_directories(extension_data_loader PUBLIC ${EXECUTORCH_ROOT}/..)
-if(WIN32)
-  target_include_directories(extension_data_loader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Windows)
-else()
-  target_include_directories(extension_data_loader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Unix)
-endif()
 target_compile_options(extension_data_loader PUBLIC ${_common_compile_options})
 
 # Install libraries

extension/data_loader/Unix/file.h

@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef _WIN32
+#include <unistd.h>
+#else
 #include <executorch/runtime/platform/compiler.h> // For ssize_t.
 #include <io.h>
 
@@ -51,3 +54,4 @@ inline ssize_t pread(int __fd, void* __buf, size_t __nbytes, size_t __offset) {
 // To avoid conflicts with std::numeric_limits<int32_t>::max() in
 // file_data_loader.cpp.
 #undef max
+#endif

extension/data_loader/Windows/file.h renamed to extension/data_loader/file.h

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