From c0ff2947eacd045d26144ae34832f9b19585b53b Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 16 Apr 2022 13:34:55 -0700
Subject: [PATCH] ast: make #includes of unistd.h unconditional

Only the one in pathfind.c was actually having the intended effect, because the
other two files were not #including config.h.

Gitlab: #2204
---
 lib/ast/CMakeLists.txt | 4 ++++
 lib/ast/ast.vcxproj    | 4 ++--
 lib/ast/pathaccess.c   | 4 ----
 lib/ast/pathfind.c     | 5 -----
 lib/ast/pathpath.c     | 4 ----
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/lib/ast/CMakeLists.txt b/lib/ast/CMakeLists.txt
index fd2f7a420..29b759119 100644
--- a/lib/ast/CMakeLists.txt
+++ b/lib/ast/CMakeLists.txt
@@ -24,3 +24,7 @@ add_library(ast STATIC
 target_include_directories(ast PRIVATE
   ..
 )
+
+if(WIN32 AND NOT MINGW)
+  target_include_directories(ast PRIVATE ../../windows/include/unistd)
+endif()
diff --git a/lib/ast/ast.vcxproj b/lib/ast/ast.vcxproj
index ac8117e76..5162248d9 100644
--- a/lib/ast/ast.vcxproj
+++ b/lib/ast/ast.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\include\unistd;$(SolutionDir)lib</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -65,7 +65,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\include\unistd;$(SolutionDir)lib</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/ast/pathaccess.c b/lib/ast/pathaccess.c
index 5e1f64c52..a9f61147c 100644
--- a/lib/ast/pathaccess.c
+++ b/lib/ast/pathaccess.c
@@ -20,11 +20,7 @@
  */
 
 #include <ast/ast.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#else
-#include <ast/compat_unistd.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c
index da9cdcce5..1f1d10522 100644
--- a/lib/ast/pathfind.c
+++ b/lib/ast/pathfind.c
@@ -15,13 +15,8 @@
  * include style search support
  */
 
-#include "config.h"
 #include <ast/ast.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#else
-#include <ast/compat_unistd.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 
diff --git a/lib/ast/pathpath.c b/lib/ast/pathpath.c
index 205302a2e..22721f9d3 100644
--- a/lib/ast/pathpath.c
+++ b/lib/ast/pathpath.c
@@ -27,11 +27,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#else
-#include <ast/compat_unistd.h>
-#endif
 
 static const char *getenv_path(void) {
   const char *path = getenv("PATH");
-- 
2.40.0