diff options
Diffstat (limited to 'Source/WebKit2/WebProcess')
| -rw-r--r-- | Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/qt/WebProcessQt.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp index 2d0d7df10..ec271b5bd 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp @@ -45,7 +45,7 @@ #endif #endif -#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS) +#if USE(MACH_PORTS) #include <servers/bootstrap.h> extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t); @@ -139,7 +139,7 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app) return 1; } -#if OS(DARWIN) +#if USE(MACH_PORTS) QString serviceName = app->arguments().value(1); // Get the server port. diff --git a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp index d4864af5b..e687966db 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp @@ -39,7 +39,7 @@ #include <WebCore/RuntimeEnabledFeatures.h> #include <wtf/RAMSize.h> -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) #include <dispatch/dispatch.h> #include <mach/host_info.h> #include <mach/mach.h> @@ -99,7 +99,7 @@ void WebProcess::platformClearResourceCaches(ResourceCachesToClear) { } -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) static void parentProcessDiedCallback(void*) { QCoreApplication::quit(); @@ -134,7 +134,7 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par } #endif -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) pid_t ppid = getppid(); dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, ppid, DISPATCH_PROC_EXIT, queue); |