diff options
| author | Jason Evans <jasone@canonware.com> | 2016-11-05 00:46:17 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-11-05 00:46:17 (GMT) |
| commit | 9bef119b42d2d5041621f975177fb7dc20fc447c (patch) | |
| tree | e904849f2949f1adbf8ce7d60462d7855768a959 /msvc/projects | |
| parent | 8019f4c21caaddb53cbc1cda7a6875947a6d7751 (diff) | |
| parent | 23f04ef9b7f6b48fd41ae895a21f351e6f549b7d (diff) | |
| download | jemalloc-4.3.0.zip jemalloc-4.3.0.tar.gz jemalloc-4.3.0.tar.bz2 | |
Merge branch 'rel-4.3.0'4.3.0
Diffstat (limited to 'msvc/projects')
| -rw-r--r-- | msvc/projects/vc2015/jemalloc/jemalloc.vcxproj | 6 | ||||
| -rw-r--r-- | msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj index 9315022..8342ab3 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj @@ -69,12 +69,14 @@ <ClInclude Include="..\..\..\..\include\jemalloc\internal\rb.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\rtree.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\size_classes.h" /> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\smoothstep.h" /> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\spin.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\stats.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\tcache.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\ticker.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\tsd.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\internal\util.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\valgrind.h" /> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\witness.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_defs.h" /> <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_macros.h" /> @@ -110,11 +112,13 @@ <ClCompile Include="..\..\..\..\src\prof.c" /> <ClCompile Include="..\..\..\..\src\quarantine.c" /> <ClCompile Include="..\..\..\..\src\rtree.c" /> + <ClCompile Include="..\..\..\..\src\spin.c" /> <ClCompile Include="..\..\..\..\src\stats.c" /> <ClCompile Include="..\..\..\..\src\tcache.c" /> <ClCompile Include="..\..\..\..\src\ticker.c" /> <ClCompile Include="..\..\..\..\src\tsd.c" /> <ClCompile Include="..\..\..\..\src\util.c" /> + <ClCompile Include="..\..\..\..\src\witness.c" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{8D6BB292-9E1C-413D-9F98-4864BDC1514A}</ProjectGuid> diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters index 88c15ef..37f0f02 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters @@ -146,6 +146,12 @@ <ClInclude Include="..\..\..\..\include\jemalloc\internal\size_classes.h"> <Filter>Header Files\internal</Filter> </ClInclude> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\smoothstep.h"> + <Filter>Header Files\internal</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\spin.h"> + <Filter>Header Files\internal</Filter> + </ClInclude> <ClInclude Include="..\..\..\..\include\jemalloc\internal\stats.h"> <Filter>Header Files\internal</Filter> </ClInclude> @@ -161,7 +167,7 @@ <ClInclude Include="..\..\..\..\include\jemalloc\internal\util.h"> <Filter>Header Files\internal</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\valgrind.h"> + <ClInclude Include="..\..\..\..\include\jemalloc\internal\witness.h"> <Filter>Header Files\internal</Filter> </ClInclude> <ClInclude Include="..\..\..\..\include\msvc_compat\strings.h"> @@ -241,6 +247,9 @@ <ClCompile Include="..\..\..\..\src\rtree.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\src\spin.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\src\stats.c"> <Filter>Source Files</Filter> </ClCompile> @@ -256,5 +265,8 @@ <ClCompile Include="..\..\..\..\src\util.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\src\witness.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |