Title: [109714] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 109714
- Author
- mrobin...@webkit.org
- Date
- 2012-03-05 00:07:08 -0800 (Mon, 05 Mar 2012)
Log Message
Merging r109509
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (109713 => 109714)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 08:05:25 UTC (rev 109713)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 08:07:08 UTC (rev 109714)
@@ -1,5 +1,18 @@
2012-03-05 Kalev Lember <kalevlem...@gmail.com>
+ WebKitTestRunner: Explicitly include unistd.h for gcc 4.7
+ https://bugs.webkit.org/show_bug.cgi?id=80033
+
+ Reviewed by Gustavo Noronha Silva.
+
+ GCC 4.7 no longer includes unistd.h from most of the standard C++
+ header files, so we need to explicitly include it for getcwd().
+
+ * WebKitTestRunner/TestInvocation.cpp: Make sure unistd.h gets included
+ not only on Mac, but on all Unix platforms.
+
+2012-03-05 Kalev Lember <kalevlem...@gmail.com>
+
[GTK] Avoid building any parts of WebKitTestRunner when WK2 is disabled
https://bugs.webkit.org/show_bug.cgi?id=80031
Modified: releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/TestInvocation.cpp (109713 => 109714)
--- releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/TestInvocation.cpp 2012-03-05 08:05:25 UTC (rev 109713)
+++ releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/TestInvocation.cpp 2012-03-05 08:07:08 UTC (rev 109714)
@@ -42,12 +42,10 @@
#include <direct.h> // For _getcwd.
#define getcwd _getcwd // MSDN says getcwd is deprecated.
#define PATH_MAX _MAX_PATH
+#else
+#include <unistd.h> // For getcwd.
#endif
-#if PLATFORM(MAC)
-#include <unistd.h>
-#endif
-
using namespace WebKit;
using namespace std;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
