Title: [148623] trunk/Source/WTF
- Revision
- 148623
- Author
- [email protected]
- Date
- 2013-04-17 11:58:20 -0700 (Wed, 17 Apr 2013)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (148622 => 148623)
--- trunk/Source/WTF/ChangeLog 2013-04-17 18:48:56 UTC (rev 148622)
+++ trunk/Source/WTF/ChangeLog 2013-04-17 18:58:20 UTC (rev 148623)
@@ -1,3 +1,15 @@
+2013-04-17 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
Harden FastMalloc against partial pointer overflows
Modified: trunk/Source/WTF/WTF.vcproj/WTFCommon.vsprops (148622 => 148623)
--- trunk/Source/WTF/WTF.vcproj/WTFCommon.vsprops 2013-04-17 18:48:56 UTC (rev 148622)
+++ trunk/Source/WTF/WTF.vcproj/WTFCommon.vsprops 2013-04-17 18:58:20 UTC (rev 148623)
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../;../wtf/;../wtf/threads/;../wtf/unicode/;"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\include\_javascript_Core";"$(WebKitLibrariesDir)\include\pthreads""
+ AdditionalIncludeDirectories="../;../wtf/;../wtf/threads/;../wtf/unicode/;"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\include\_javascript_Core""
PreprocessorDefinitions="__STD_C"
ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb"
ForcedIncludeFiles="ICUVersion.h"
Modified: trunk/Source/WTF/WTF.vcxproj/WTFCommon.props (148622 => 148623)
--- trunk/Source/WTF/WTF.vcxproj/WTFCommon.props 2013-04-17 18:48:56 UTC (rev 148622)
+++ trunk/Source/WTF/WTF.vcxproj/WTFCommon.props 2013-04-17 18:58:20 UTC (rev 148623)
@@ -7,7 +7,7 @@
<ItemGroup />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>../;../wtf/;../wtf/threads/;../wtf/unicode/;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\_javascript_Core;$(WebKit_Libraries)\include\pthreads;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../;../wtf/;../wtf/threads/;../wtf/unicode/;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\_javascript_Core;$(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>
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (148622 => 148623)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2013-04-17 18:48:56 UTC (rev 148622)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2013-04-17 18:58:20 UTC (rev 148623)
@@ -430,7 +430,9 @@
#include "TCSystemAlloc.h"
#include "ThreadSpecific.h"
#include <algorithm>
+#if USE(PTHREADS)
#include <pthread.h>
+#endif
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
