continuing code cleanup by moving win32 specific code into Win32_Interop directory

deps/hiredis/async.c

@@ -43,7 +43,7 @@
 #include "dict.c"
 #include "sds.h"
 #ifdef _WIN32
-  #include "../../src/win32fixes.h"
+  #include "../../src/win32_Interop/win32fixes.h"
 #endif
 
 #define _EL_ADD_READ(ctx) do { \

deps/hiredis/hiredis.c

@@ -43,7 +43,7 @@
 #include "net.h"
 #include "sds.h"
 #ifdef _WIN32
-  #include "../../src/win32fixes.h"
+  #include "../../src/win32_Interop/win32fixes.h"
 #endif
 
 static redisReply *createReplyObject(int type);

deps/hiredis/hiredis.h

@@ -37,7 +37,7 @@
 #include <sys/time.h> /* for struct timeval */
 #endif
 #ifdef _WIN32
-    #include "..\..\src\Win32_FDAPI.h"
+    #include "..\..\src\win32_Interop\Win32_FDAPI.h"
     #include <windows.h>
 
     #ifndef va_copy

deps/hiredis/net.c

@@ -55,7 +55,7 @@
 #include "net.h"
 #include "sds.h"
 #ifdef _WIN32
-  #include "../../src/win32fixes.h"
+  #include "../../src/win32_Interop/win32fixes.h"
 #endif
 
 /* Defined in hiredis.c */

deps/linenoise/linenoise.c

@@ -98,7 +98,7 @@
 #include <sys/types.h>
 #include "linenoise.h"
 #ifdef _WIN32
-  #include "../../src/win32fixes.h"
+  #include "../../src/win32_Interop/win32fixes.h"
   #define REDIS_NOTUSED(V) ((void) V)
 #endif
 

msvs/RedisBenchmark/RedisBenchmark.vcxproj

@@ -104,7 +104,7 @@
     <ProjectReference Include="..\..\src\APIBridge\APIBridge.vcxproj">
       <Project>{0a28b490-79de-4d7f-bb46-d75cf0d026ed}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\Win32_Redis\Win32_Redis.vcxproj">
+    <ProjectReference Include="..\..\src\Win32_Interop\Win32_Interop.vcxproj">
       <Project>{8c07f811-c81c-432c-b334-1ae6faecf951}</Project>
     </ProjectReference>
   </ItemGroup>

msvs/RedisCheckAof/RedisCheckAof.vcxproj

@@ -90,7 +90,7 @@
     <ProjectReference Include="..\..\src\APIBridge\APIBridge.vcxproj">
       <Project>{0a28b490-79de-4d7f-bb46-d75cf0d026ed}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\Win32_Redis\Win32_Redis.vcxproj">
+    <ProjectReference Include="..\..\src\Win32_Interop\Win32_Interop.vcxproj">
       <Project>{8c07f811-c81c-432c-b334-1ae6faecf951}</Project>
     </ProjectReference>
   </ItemGroup>

msvs/RedisCheckDump/RedisCheckDump.vcxproj

@@ -93,7 +93,7 @@
     <ProjectReference Include="..\..\src\APIBridge\APIBridge.vcxproj">
       <Project>{0a28b490-79de-4d7f-bb46-d75cf0d026ed}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\Win32_Redis\Win32_Redis.vcxproj">
+    <ProjectReference Include="..\..\src\Win32_Interop\Win32_Interop.vcxproj">
       <Project>{8c07f811-c81c-432c-b334-1ae6faecf951}</Project>
     </ProjectReference>
   </ItemGroup>

msvs/RedisCli/RedisCli.vcxproj

@@ -99,7 +99,7 @@
     <ProjectReference Include="..\..\src\APIBridge\APIBridge.vcxproj">
       <Project>{0a28b490-79de-4d7f-bb46-d75cf0d026ed}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\Win32_Redis\Win32_Redis.vcxproj">
+    <ProjectReference Include="..\..\src\Win32_Interop\Win32_Interop.vcxproj">
       <Project>{8c07f811-c81c-432c-b334-1ae6faecf951}</Project>
     </ProjectReference>
   </ItemGroup>

msvs/RedisServer.sln

@@ -31,7 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\lua\lua.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APIBridge", "..\src\APIBridge\APIBridge.vcxproj", "{0A28B490-79DE-4D7F-BB46-D75CF0D026ED}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32_Redis", "..\Win32_Redis\Win32_Redis.vcxproj", "{8C07F811-C81C-432C-B334-1AE6FAECF951}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32_Interop", "..\src\Win32_Interop\Win32_Interop.vcxproj", "{8C07F811-C81C-432C-B334-1AE6FAECF951}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

msvs/RedisServer.vcxproj

@@ -168,7 +168,7 @@
     <ProjectReference Include="..\src\APIBridge\APIBridge.vcxproj">
       <Project>{0a28b490-79de-4d7f-bb46-d75cf0d026ed}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Win32_Redis\Win32_Redis.vcxproj">
+    <ProjectReference Include="..\src\Win32_Interop\Win32_Interop.vcxproj">
       <Project>{8c07f811-c81c-432c-b334-1ae6faecf951}</Project>
     </ProjectReference>
   </ItemGroup>

src/RedisLog.c

@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <process.h>
-#include "win32Fixes.h"
+#include "win32_Interop/win32Fixes.h"
 #include <time.h>
 
 

src/Win32_Interop/Win32_FDAPI.cpp

@@ -22,7 +22,7 @@
 
 #include "Win32_FDAPI.h"
 #include "win32_rfdmap.h"
-#include "APIBridge\APIBridge.h"
+#include "..\APIBridge\APIBridge.h"
 #include <exception>
 #include <mswsock.h>
 #include <sys/stat.h>

src/Win32_Interop/Win32_Interop.vcxproj

@@ -10,6 +10,26 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="win32fixes.c" />
+    <ClCompile Include="Win32_dlmalloc.c" />
+    <ClCompile Include="Win32_FDAPI.cpp" />
+    <ClCompile Include="Win32_QFork.cpp" />
+    <ClCompile Include="Win32_QFork_impl.c" />
+    <ClCompile Include="win32_rfdmap.cpp" />
+    <ClCompile Include="win32_wsiocp.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="win32fixes.h" />
+    <ClInclude Include="Win32_dlmalloc.h" />
+    <ClInclude Include="Win32_FDAPI.h" />
+    <ClInclude Include="Win32_QFork.h" />
+    <ClInclude Include="Win32_QFork_impl.h" />
+    <ClInclude Include="win32_rfdmap.h" />
+    <ClInclude Include="Win32_SmartHandle.h" />
+    <ClInclude Include="win32_wsiocp.h" />
+    <ClInclude Include="WS2tcpip.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8C07F811-C81C-432C-B334-1AE6FAECF951}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -76,26 +96,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\win32fixes.c" />
-    <ClCompile Include="..\src\Win32_dlmalloc.c" />
-    <ClCompile Include="..\src\Win32_FDAPI.cpp" />
-    <ClCompile Include="..\src\Win32_QFork.cpp" />
-    <ClCompile Include="..\src\Win32_QFork_impl.c" />
-    <ClCompile Include="..\src\win32_rfdmap.cpp" />
-    <ClCompile Include="..\src\win32_wsiocp.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\win32fixes.h" />
-    <ClInclude Include="..\src\Win32_dlmalloc.h" />
-    <ClInclude Include="..\src\Win32_FDAPI.h" />
-    <ClInclude Include="..\src\Win32_QFork.h" />
-    <ClInclude Include="..\src\Win32_QFork_impl.h" />
-    <ClInclude Include="..\src\win32_rfdmap.h" />
-    <ClInclude Include="..\src\Win32_SmartHandle.h" />
-    <ClInclude Include="..\src\win32_wsiocp.h" />
-    <ClInclude Include="..\src\WS2tcpip.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

src/Win32_Interop/Win32_QFork_impl.c

@@ -20,8 +20,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "redis.h"
-#include "rdb.h"
+#include "..\redis.h"
+#include "..\rdb.h"
 
 void SetupGlobals(LPVOID globalData, size_t globalDataSize, uint32_t dictHashSeed)
 {

src/Win32_Interop/win32_wsiocp.c

@@ -21,9 +21,9 @@
  */
 
 #include "win32fixes.h"
-#include "ae.h"
-#include "adlist.h"
-#include "zmalloc.h"
+#include "..\ae.h"
+#include "..\adlist.h"
+#include "..\zmalloc.h"
 #include <mswsock.h>
 #include <Guiddef.h>
 #include "win32_wsiocp.h"

src/Win32_Interop/win32fixes.h

@@ -21,7 +21,7 @@
 #define NOGDI
 #define __USE_W32_SOCKETS
 
-#include "fmacros.h"
+#include "..\fmacros.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>

src/ae.c

@@ -39,7 +39,7 @@
 #else
 #include <sys/types.h> 
 #include <sys/timeb.h>
-#include "..\..\src\Win32_FDAPI.h"
+#include "..\..\src\win32_Interop\Win32_FDAPI.h"
 #endif
 #include <stdlib.h>
 #include <string.h>

src/ae_wsiocp.c

@@ -24,10 +24,10 @@
 
 #include <string.h>
 #include "ae.h"
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #include "zmalloc.h"
 #include "adlist.h"
-#include "win32_wsiocp.h"
+#include "win32_Interop/win32_wsiocp.h"
 #include <mswsock.h>
 #include <Guiddef.h>
 

src/anet.c

@@ -47,7 +47,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #define ANET_NOTUSED(V) V
 #endif
 

src/bio.c

@@ -61,7 +61,7 @@
 #include "redis.h"
 #include "bio.h"
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #endif
 
 static pthread_mutex_t bio_mutex[REDIS_BIO_NUM_OPS];

src/dict.c

@@ -48,7 +48,7 @@
 
 #include "dict.h"
 #include "zmalloc.h"
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 
 /* Using dictEnableResize() / dictDisableResize() we make possible to
  * enable/disable resizing of the hash table as needed. This is very important

src/memtest.c

@@ -37,7 +37,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #else
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #endif
 
 #if (ULONG_MAX == 4294967295UL)

src/object.c

@@ -30,7 +30,7 @@
 
 #include "redis.h"
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #else
 #include <pthread.h>
 #endif

src/redis-benchmark.c

@@ -42,7 +42,7 @@
 #include <assert.h>
 
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 int fmode = _O_BINARY;
 #endif
 

src/redis-check-aof.c

@@ -39,7 +39,7 @@
 #include "config.h"
 
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "Win32_Interop\win32fixes.h"
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 #endif

src/redis-check-dump.c

@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "Win32_Interop/win32fixes.h"
 #else
 #include <sys/mman.h>
 #include <arpa/inet.h>

src/redis-cli.c

@@ -50,7 +50,7 @@
 #ifndef STDIN_FILENO
   #define STDIN_FILENO (_fileno(stdin))
 #endif
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #include <windows.h>
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
@@ -64,7 +64,7 @@
 #ifndef STDIN_FILENO
   #define STDIN_FILENO (_fileno(stdin))
 #endif
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #include <windows.h>
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp

src/redis.h

@@ -48,7 +48,7 @@
 #endif
 #include <errno.h>
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #else
 #include <pthread.h>
 #include <syslog.h>

src/sds.c

@@ -36,7 +36,7 @@
 #include "sds.h"
 #include "zmalloc.h"
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #endif
 
 sds sdsnewlen(const void *init, size_t initlen) {

src/sha1.c

@@ -28,7 +28,7 @@ A million repetitions of "a"
 #include "solarisfixes.h"
 #endif
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #endif
 #include "sha1.h"
 #include "config.h"

src/util.c

@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #else
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #endif
 #include <float.h>
 

src/zmalloc.c

@@ -41,7 +41,7 @@ void zlibc_free(void *ptr) {
 
 #include <string.h>
 #ifdef _WIN32
-#include "win32fixes.h"
+#include "win32_Interop/win32fixes.h"
 #else
 #include <pthread.h>
 #endif

src/zmalloc.h

@@ -61,7 +61,7 @@
 #define zmalloc_size(p) malloc_size(p)
 
 #elif defined(USE_DLMALLOC)
-#include "win32_dlmalloc.h"
+#include "win32_Interop/win32_dlmalloc.h"
 #define ZMALLOC_LIB ("dlmalloc-" __xstr(2) "." __xstr(8) )
 #define HAVE_MALLOC_SIZE 1
 #define zmalloc_size(p) dlmalloc_usable_size(p)