Title: [109710] releases/WebKitGTK/webkit-1.8/Tools
Revision
109710
Author
[email protected]
Date
2012-03-04 23:58:18 -0800 (Sun, 04 Mar 2012)

Log Message

Merging r108540

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (109709 => 109710)


--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog	2012-03-05 07:57:36 UTC (rev 109709)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog	2012-03-05 07:58:18 UTC (rev 109710)
@@ -1,3 +1,19 @@
+2012-03-04  Kalev Lember  <[email protected]>
+
+        Explicitly include unistd.h in TestNetscapePlugIn for GCC 4.7
+        https://bugs.webkit.org/show_bug.cgi?id=77759
+
+        Reviewed by Tony Chang.
+
+        Fixes build with gcc 4.7.
+
+        r100432 added the include only for ANDROID; this changes the ifdef to
+        also cover other unix platforms. On Fedora 17 the gcc 4.7 compiler no
+        longer implicitly includes unistd.h from standard headers and other
+        unix platforms are likely to get gcc 4.7 as well in the future.
+
+        * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
+
 2012-02-22  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed, rolling out r107351.

Modified: releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp (109709 => 109710)


--- releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	2012-03-05 07:57:36 UTC (rev 109709)
+++ releases/WebKitGTK/webkit-1.8/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	2012-03-05 07:58:18 UTC (rev 109710)
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <string.h>
 
-#if defined(ANDROID)
+#if defined(XP_UNIX) || defined(ANDROID)
 #include <unistd.h>
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to