[mac] Stop using bootstrap_look_up2
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Dec 2011 04:08:42 +0000 (04:08 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Dec 2011 04:08:42 +0000 (04:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=75280

Reviewed by Mark Rowe.

* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain): Changed to use bootstrap_look_up() instead of
bootstrap_look_up2().
* WebProcess/mac/WebProcessMainMac.mm:
(WebKit::WebProcessMain): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@103755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm

index 0fa0615402255abcbf3ac3c20995bec9e02592dc..c6b6ad11e0f0fe7a20035d3ac6e95035b396e56a 100644 (file)
@@ -1,3 +1,16 @@
+2011-12-27  Dan Bernstein  <mitz@apple.com>
+
+        [mac] Stop using bootstrap_look_up2
+        https://bugs.webkit.org/show_bug.cgi?id=75280
+
+        Reviewed by Mark Rowe.
+
+        * PluginProcess/mac/PluginProcessMainMac.mm:
+        (WebKit::PluginProcessMain): Changed to use bootstrap_look_up() instead of
+        bootstrap_look_up2().
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMain): Ditto.
+
 2011-12-27  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         [Qt] Make the inputMethodEvent set or confirm the composition
index 2f5e219aba1e18d69a04108f5cfec9e86b43ec28..d4edf5527357579031e59b03780867d8038840e8 100644 (file)
@@ -42,9 +42,6 @@
 #import <wtf/text/WTFString.h>
 #include <stdio.h>
 
-// FIXME: We should be doing this another way.
-extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
-
 #define SHOW_CRASH_REPORTER 1
 
 namespace WebKit {
@@ -76,9 +73,9 @@ int PluginProcessMain(const CommandLine& commandLine)
     
     // Get the server port.
     mach_port_t serverPort;
-    kern_return_t kr = bootstrap_look_up2(bootstrap_port, serviceName.utf8().data(), &serverPort, 0, 0);
+    kern_return_t kr = bootstrap_look_up(bootstrap_port, serviceName.utf8().data(), &serverPort);
     if (kr) {
-        printf("bootstrap_look_up2 result: %x", kr);
+        printf("bootstrap_look_up result: %x", kr);
         return EXIT_FAILURE;
     }
 
index eb219fcb1a4ec8f6d45cb0c463e62a4d5aebfa6a..a80b67cb494aa259af4d44e148765993a7695c65 100644 (file)
@@ -45,9 +45,6 @@
 #import <wtf/text/CString.h>
 #import <wtf/text/StringBuilder.h>
 
-// FIXME: We should be doing this another way.
-extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
-
 @interface NSApplication (WebNSApplicationDetails)
 -(void)_installAutoreleasePoolsOnCurrentThreadIfNecessary;
 @end
@@ -74,9 +71,9 @@ int WebProcessMain(const CommandLine& commandLine)
 
     // Get the server port.
     mach_port_t serverPort;
-    kern_return_t kr = bootstrap_look_up2(bootstrap_port, serviceName.utf8().data(), &serverPort, 0, 0);
+    kern_return_t kr = bootstrap_look_up(bootstrap_port, serviceName.utf8().data(), &serverPort);
     if (kr) {
-        printf("bootstrap_look_up2 result: %x", kr);
+        printf("bootstrap_look_up result: %x", kr);
         return 2;
     }