From c2c817928528ce3a0288e9d316dd359a5c356f93 Mon Sep 17 00:00:00 2001
From: manojampalam <manojampalam@live.com>
Date: Wed, 2 Mar 2016 16:32:05 -0800
Subject: [PATCH] 3-2 C2

---
 .../win32posix/win32posix/fileio.c                   |  2 +-
 .../win32posix/win32posix/{ => inc}/defs.h           |  0
 .../win32posix/win32posix/inc/fcntl.h                |  2 +-
 .../win32posix/win32posix/inc/sys/socket.h           |  2 +-
 .../win32posix/win32posix/inc/sys/stat.h             |  2 +-
 .../win32posix/win32posix/inc/unistd.h               |  2 +-
 .../win32posix/win32posix/{ => inc}/w32posix.h       |  0
 .../win32posix/win32posix/w32fd.c                    |  2 +-
 .../win32posix/win32posix/win32posix.vcxproj         |  4 ++--
 .../win32posix/win32posix/win32posix.vcxproj.filters | 12 ++++++------
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename contrib/win32/w32-posix-prototype/win32posix/win32posix/{ => inc}/defs.h (100%)
 rename contrib/win32/w32-posix-prototype/win32posix/win32posix/{ => inc}/w32posix.h (100%)

diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c b/contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c
index c903d8f..4bd16a9 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <io.h>
 #include "w32fd.h"
-#include "defs.h"
+#include "inc/defs.h"
 #include <errno.h>
 #include <stddef.h>
 
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/defs.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h
similarity index 100%
rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/defs.h
rename to contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/fcntl.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/fcntl.h
index 149332c..19def5c 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/fcntl.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/fcntl.h
@@ -1 +1 @@
-#include "..\w32posix.h"
\ No newline at end of file
+#include "w32posix.h"
\ No newline at end of file
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h
index b58fcb2..149332c 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h
@@ -1 +1 @@
-#include "..\..\w32posix.h"
\ No newline at end of file
+#include "..\w32posix.h"
\ No newline at end of file
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/stat.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/stat.h
index b58fcb2..149332c 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/stat.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/stat.h
@@ -1 +1 @@
-#include "..\..\w32posix.h"
\ No newline at end of file
+#include "..\w32posix.h"
\ No newline at end of file
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h
index 149332c..19def5c 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h
@@ -1 +1 @@
-#include "..\w32posix.h"
\ No newline at end of file
+#include "w32posix.h"
\ No newline at end of file
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32posix.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h
similarity index 100%
rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/w32posix.h
rename to contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c b/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
index ef95a03..ae566f6 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
@@ -1,4 +1,4 @@
-#include "w32posix.h"
+#include "inc\w32posix.h"
 #include "w32fd.h"
 #include <stdarg.h>
 #include <errno.h>
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj
index cf0659e..8183e10 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj
@@ -152,13 +152,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="debug.h" />
-    <ClInclude Include="defs.h" />
+    <ClInclude Include="inc\defs.h" />
     <ClInclude Include="inc\fcntl.h" />
     <ClInclude Include="inc\sys\socket.h" />
     <ClInclude Include="inc\sys\stat.h" />
     <ClInclude Include="inc\unistd.h" />
+    <ClInclude Include="inc\w32posix.h" />
     <ClInclude Include="w32fd.h" />
-    <ClInclude Include="w32posix.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters
index 36c313e..c19f75f 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters
@@ -41,12 +41,6 @@
     <ClInclude Include="w32fd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="w32posix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="debug.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -62,5 +56,11 @@
     <ClInclude Include="inc\fcntl.h">
       <Filter>inc</Filter>
     </ClInclude>
+    <ClInclude Include="inc\w32posix.h">
+      <Filter>inc</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\defs.h">
+      <Filter>inc</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file