Title: [89784] trunk/Source/WebKit2
Revision
89784
Author
mr...@apple.com
Date
2011-06-26 23:22:06 -0700 (Sun, 26 Jun 2011)

Log Message

<rdar://problem/9679221&9679235> Work around an issue with sandbox.h.

Rubber-stamped by Maciej Stachowiak.

* WebProcess/mac/WebProcessMac.mm:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (89783 => 89784)


--- trunk/Source/WebKit2/ChangeLog	2011-06-27 06:16:05 UTC (rev 89783)
+++ trunk/Source/WebKit2/ChangeLog	2011-06-27 06:22:06 UTC (rev 89784)
@@ -1,3 +1,11 @@
+2011-06-26  Mark Rowe  <mr...@apple.com>
+
+        Rubber-stamped by Maciej Stachowiak.
+
+        <rdar://problem/9679221&9679235> Work around an issue with sandbox.h.
+
+        * WebProcess/mac/WebProcessMac.mm:
+
 2011-06-26  Anders Carlsson  <ander...@apple.com>
 
         Reviewed by Dan Bernstein.

Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (89783 => 89784)


--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm	2011-06-27 06:16:05 UTC (rev 89783)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm	2011-06-27 06:22:06 UTC (rev 89784)
@@ -51,9 +51,16 @@
 #endif
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
-#import <sandbox.h>
 #import <stdlib.h>
 #import <sysexits.h>
+
+// We have to #undef __APPLE_API_PRIVATE to prevent sandbox.h from looking for a header file that does not exist (<rdar://problem/9679211>). 
+#undef __APPLE_API_PRIVATE
+#import <sandbox.h>
+
+#define SANDBOX_NAMED_EXTERNAL 0x0003
+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+
 #endif
 
 using namespace WebCore;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to