cleanyup

MarilynDafa · Sep 14, 2020 · 62d3168 · 62d3168
1 parent cac7ce2
commit 62d3168
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/code/main.c b/code/main.c
@@ -398,6 +398,7 @@ static void init_project() {
     chmod("ij_modules/redis/redis", S_IRWXU);
 #elif defined(linux) || defined(__linux) || defined(__linux__)
     fp = fopen("ij_modules/redis/redis", "wb");
+    chmod("ij_modules/redis/redis", S_IRWXU);
 #endif
     fwrite(buf, 1, sz, fp);
     fclose(fp);

diff --git a/modules/redis/redis-win32.vcxproj b/modules/redis/redis-win32.vcxproj
@@ -92,7 +92,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -110,7 +110,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -130,7 +130,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -152,7 +152,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -169,7 +169,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\code\externals\jemalloc\include\jemalloc\jemalloc.h" />
     <ClInclude Include="..\..\code\externals\jemalloc\include\jemalloc\jemalloc_defs.h" />
-    <ClInclude Include="..\..\code\externals\pthread\pthread.h" />
+    <ClInclude Include="..\..\code\externals\wpthread\pthread.h" />
     <ClInclude Include="lua\lua.h" />
     <ClInclude Include="lua\lualib.h" />
     <ClInclude Include="Win32_Interop\dlfcn.h" />
@@ -238,7 +238,7 @@
     <ClCompile Include="..\..\code\externals\jemalloc\ticker.c" />
     <ClCompile Include="..\..\code\externals\jemalloc\tsd.c" />
     <ClCompile Include="..\..\code\externals\jemalloc\witness.c" />
-    <ClCompile Include="..\..\code\externals\pthread\pthread.c" />
+    <ClCompile Include="..\..\code\externals\wpthread\pthread.c" />
     <ClCompile Include="lua\lua.c" />
     <ClCompile Include="Win32_Interop\dlfcn.c" />
     <ClCompile Include="Win32_Interop\win32fixes.c" />

diff --git a/modules/redis/redis-win32.vcxproj.filters b/modules/redis/redis-win32.vcxproj.filters
@@ -114,7 +114,7 @@
     <ClInclude Include="..\..\code\externals\jemalloc\include\jemalloc\jemalloc_defs.h">
       <Filter>jemalloc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\externals\pthread\pthread.h">
+    <ClInclude Include="..\..\code\externals\wpthread\pthread.h">
       <Filter>Win32_Interop</Filter>
     </ClInclude>
   </ItemGroup>
@@ -287,7 +287,7 @@
     <ClCompile Include="..\..\code\externals\jemalloc\witness.c">
       <Filter>jemalloc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\externals\pthread\pthread.c">
+    <ClCompile Include="..\..\code\externals\wpthread\pthread.c">
       <Filter>Win32_Interop</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/proj/libijjs-win32.vcxproj b/proj/libijjs-win32.vcxproj
@@ -94,7 +94,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningVersion>
       </WarningVersion>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
@@ -116,7 +116,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;USE_WIN32_CRYPTO;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningVersion>
       </WarningVersion>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
@@ -140,7 +140,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningVersion>
       </WarningVersion>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
@@ -167,7 +167,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningVersion>
       </WarningVersion>
       <AdditionalOptions>-Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
@@ -192,7 +192,6 @@
     <ClInclude Include="..\code\externals\cwin\sys\time.h" />
     <ClInclude Include="..\code\externals\cwin\unistd.h" />
     <ClInclude Include="..\code\externals\cwin\zlib.h" />
-    <ClInclude Include="..\code\externals\pthread\pthread.h" />
     <ClInclude Include="..\code\externals\uv\src\win\atomicops-inl.h" />
     <ClInclude Include="..\code\externals\uv\src\win\fs-fd-hash-inl.h" />
     <ClInclude Include="..\code\externals\uv\src\win\handle-inl.h" />
@@ -201,14 +200,14 @@
     <ClInclude Include="..\code\externals\uv\src\win\stream-inl.h" />
     <ClInclude Include="..\code\externals\uv\src\win\winapi.h" />
     <ClInclude Include="..\code\externals\uv\src\win\winsock.h" />
+    <ClInclude Include="..\code\externals\wpthread\pthread.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\code\externals\cwin\glob.c" />
     <ClCompile Include="..\code\externals\cwin\setenv.c" />
     <ClCompile Include="..\code\externals\cwin\syslog-client.c" />
     <ClCompile Include="..\code\externals\cwin\sys\time.c" />
     <ClCompile Include="..\code\externals\cwin\unistd.c" />
-    <ClCompile Include="..\code\externals\pthread\pthread.c" />
     <ClCompile Include="..\code\externals\uv\src\win\async.c" />
     <ClCompile Include="..\code\externals\uv\src\win\core.c" />
     <ClCompile Include="..\code\externals\uv\src\win\detect-wakeup.c" />
@@ -234,6 +233,7 @@
     <ClCompile Include="..\code\externals\uv\src\win\util.c" />
     <ClCompile Include="..\code\externals\uv\src\win\winapi.c" />
     <ClCompile Include="..\code\externals\uv\src\win\winsock.c" />
+    <ClCompile Include="..\code\externals\wpthread\pthread.c" />
     <ClCompile Include="..\code\externals\zlog\win_compat.c" />
     <ClCompile Include="..\code\src\m.c" />
   </ItemGroup>

diff --git a/proj/libijjs-win32.vcxproj.filters b/proj/libijjs-win32.vcxproj.filters
@@ -55,7 +55,7 @@
     <ClInclude Include="..\code\externals\cwin\syslog.h">
       <Filter>cwin</Filter>
     </ClInclude>
-    <ClInclude Include="..\code\externals\pthread\pthread.h">
+    <ClInclude Include="..\code\externals\wpthread\pthread.h">
       <Filter>cwin</Filter>
     </ClInclude>
   </ItemGroup>
@@ -156,7 +156,7 @@
     <ClCompile Include="..\code\externals\cwin\setenv.c">
       <Filter>cwin</Filter>
     </ClCompile>
-    <ClCompile Include="..\code\externals\pthread\pthread.c">
+    <ClCompile Include="..\code\externals\wpthread\pthread.c">
       <Filter>cwin</Filter>
     </ClCompile>
   </ItemGroup>