From ea9112e0a5f4933a85768a48c7bf19b4d8dc6879 Mon Sep 17 00:00:00 2001
From: Mark Adams <marka@nvidia.com>
Date: Tue, 27 Oct 2015 14:27:18 -0400
Subject: [PATCH] Remove obsolete unistd.h file

The presence of this file can cause build issues when integrating glslang
into other projects.
---
 glslang.vcxproj                     | 3 +--
 glslang.vcxproj.filters             | 5 +----
 glslang/CMakeLists.txt              | 1 -
 glslang/MachineIndependent/unistd.h | 1 -
 glslang_vs2010.vcxproj              | 3 +--
 glslang_vs2013.vcxproj              | 3 +--
 6 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 glslang/MachineIndependent/unistd.h

diff --git a/glslang.vcxproj b/glslang.vcxproj
index e576c45c8..59d33279a 100644
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
@@ -643,7 +643,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />
     <ClInclude Include="glslang\Include\Types.h" />
     <ClInclude Include="glslang\Include\intermediate.h" />
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />
     <ClInclude Include="glslang\Public\ShaderLang.h" />
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />
@@ -704,4 +703,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/glslang.vcxproj.filters b/glslang.vcxproj.filters
index 2f3b2be5b..5110deaef 100644
--- a/glslang.vcxproj.filters
+++ b/glslang.vcxproj.filters
@@ -165,9 +165,6 @@
     <ClInclude Include="glslang\Include\intermediate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="glslang\MachineIndependent\unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="glslang\Public\ShaderLang.h">
       <Filter>Public</Filter>
     </ClInclude>
@@ -204,4 +201,4 @@
       <Filter>Machine Independent</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 96abc2ad9..f8b1799b8 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -63,7 +63,6 @@ set(HEADERS
     MachineIndependent/Scan.h
     MachineIndependent/ScanContext.h
     MachineIndependent/SymbolTable.h
-    MachineIndependent/unistd.h
     MachineIndependent/Versions.h
     MachineIndependent/preprocessor/PpContext.h
     MachineIndependent/preprocessor/PpTokens.h)
diff --git a/glslang/MachineIndependent/unistd.h b/glslang/MachineIndependent/unistd.h
deleted file mode 100644
index c7c914709..000000000
--- a/glslang/MachineIndependent/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-// This is a NULL file and is meant to be empty
diff --git a/glslang_vs2010.vcxproj b/glslang_vs2010.vcxproj
index a6cb6e229..64e04660a 100644
--- a/glslang_vs2010.vcxproj
+++ b/glslang_vs2010.vcxproj
@@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />
     <ClInclude Include="glslang\Include\Types.h" />
     <ClInclude Include="glslang\Include\intermediate.h" />
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />
     <ClInclude Include="glslang\Public\ShaderLang.h" />
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />
@@ -403,4 +402,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/glslang_vs2013.vcxproj b/glslang_vs2013.vcxproj
index 3b8d2c958..df9bb2a28 100644
--- a/glslang_vs2013.vcxproj
+++ b/glslang_vs2013.vcxproj
@@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />
     <ClInclude Include="glslang\Include\Types.h" />
     <ClInclude Include="glslang\Include\intermediate.h" />
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />
     <ClInclude Include="glslang\Public\ShaderLang.h" />
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />
@@ -403,4 +402,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
GitLab