summaryrefslogtreecommitdiff
path: root/patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
blob: 66c78cf72027c75a670832d7e257ff1e0137d68f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
$OpenBSD: patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp,v 1.4 2014/01/29 17:28:05 ajacoutot Exp $

To remove in 2.4.x ?
https://bugs.webkit.org/show_bug.cgi?id=126779
https://trac.webkit.org/changeset/162513/trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

--- Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp.orig	Mon Sep  9 10:29:14 2013
+++ Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp	Mon Sep 23 22:42:22 2013
@@ -39,6 +39,9 @@
 #include <glib.h>
 #include <wtf/gobject/GOwnPtr.h>
 #endif
+#if OS(OPENBSD)
+#include <sys/wait.h>
+#endif
 
 using namespace WebCore;
 
@@ -74,16 +77,16 @@ bool PluginProcessProxy::scanPlugin(const String& plug
     int status;
     GOwnPtr<char> stdOut;
 
-    // If the disposition of SIGCLD signal is set to SIG_IGN (default)
+    // If the disposition of SIGCHLD signal is set to SIG_IGN (default)
     // then the signal will be ignored and g_spawn_sync() will not be
     // able to return the status.
     // As a consequence, we make sure that the disposition is set to
     // SIG_DFL before calling g_spawn_sync().
     struct sigaction action;
-    sigaction(SIGCLD, 0, &action);
+    sigaction(SIGCHLD, 0, &action);
     if (action.sa_handler == SIG_IGN) {
         action.sa_handler = SIG_DFL;
-        sigaction(SIGCLD, &action, 0);
+        sigaction(SIGCHLD, &action, 0);
     }
 
     if (!g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, &stdOut.outPtr(), 0, &status, 0))