Commit 5683c9f9 authored by bfulgham@webkit.org's avatar bfulgham@webkit.org

[Windows, WinCairo] Remove Include Settings for Pthreads from WTF

https://bugs.webkit.org/show_bug.cgi?id=114694

Reviewed by Ryosuke Niwa.

* WTF.vcproj/WTFCommon.vsprops: Remove pthread search path.
* WTF.vcxproj/WTFCommon.props: Remove pthread search path.
* wtf/FastMalloc.cpp: Guard pthread.h include for non-pthread
builds.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 17761407
2013-04-17 Brent Fulgham <bfulgham@webkit.org>
[Windows, WinCairo] Remove Include Settings for Pthreads from WTF
https://bugs.webkit.org/show_bug.cgi?id=114694
Reviewed by Ryosuke Niwa.
* WTF.vcproj/WTFCommon.vsprops: Remove pthread search path.
* WTF.vcxproj/WTFCommon.props: Remove pthread search path.
* wtf/FastMalloc.cpp: Guard pthread.h include for non-pthread
builds.
2013-04-16 Oliver Hunt <oliver@apple.com>
Harden FastMalloc against partial pointer overflows
......
......@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../;../wtf/;../wtf/threads/;../wtf/unicode/;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
AdditionalIncludeDirectories="../;../wtf/;../wtf/threads/;../wtf/unicode/;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;"
PreprocessorDefinitions="__STD_C"
ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb"
ForcedIncludeFiles="ICUVersion.h"
......
......@@ -7,7 +7,7 @@
<ItemGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>../;../wtf/;../wtf/threads/;../wtf/unicode/;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(WebKit_Libraries)\include\pthreads;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../;../wtf/;../wtf/threads/;../wtf/unicode/;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;__STD_C;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
......@@ -25,4 +25,4 @@
<OutputFile>$(OutDir)\$(TargetName).bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -430,7 +430,9 @@ extern "C" WTF_EXPORT_PRIVATE const int jscore_fastmalloc_introspection = 0;
#include "TCSystemAlloc.h"
#include "ThreadSpecific.h"
#include <algorithm>
#if USE(PTHREADS)
#include <pthread.h>
#endif
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment