diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml --- a/toolkit/library/rust/shared/Cargo.toml +++ b/toolkit/library/rust/shared/Cargo.toml @@ -38,17 +38,17 @@ log = {version = "0.4", features = ["rel cose-c = { version = "0.1.5" } jsrust_shared = { path = "../../../../js/src/rust/shared" } cascade_bloom_filter = { path = "../../../components/cascade_bloom_filter" } cert_storage = { path = "../../../../security/manager/ssl/cert_storage" } bitsdownload = { path = "../../../components/bitsdownload", optional = true } storage = { path = "../../../../storage/rust" } bookmark_sync = { path = "../../../components/places/bookmark_sync", optional = true } chardetng_c = "0.1.1" -audio_thread_priority = { version = "0.26.1" } +audio_thread_priority = { version = "0.26.1", default_features = false, features = ["winapi"] } mdns_service = { path="../../../../dom/media/webrtc/transport/mdns_service", optional = true } neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" } wgpu_bindings = { path = "../../../../gfx/wgpu_bindings" } mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", rev = "746743227485a83123784df0c53227ab466612ed" } fog_control = { path = "../../../components/glean" } app_services_logger = { path = "../../../../services/common/app_services_logger" } http_sfv = { path = "../../../../netwerk/base/http-sfv" } unic-langid = { version = "0.9", features = ["likelysubtags"] } diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index d3bab6cf..656b32c7 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -26,7 +26,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": "nsUnixRemoteServer.h", "RemoteUtils.h", ] - else: + elif CONFIG["MOZ_X11"]: SOURCES += [ "nsGTKRemoteServer.cpp", "nsXRemoteClient.cpp", diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp index ef4b95cb..4941f213 100644 --- a/toolkit/components/remote/nsRemoteService.cpp +++ b/toolkit/components/remote/nsRemoteService.cpp @@ -12,12 +12,14 @@ #ifdef MOZ_WIDGET_GTK # include "mozilla/WidgetUtilsGtk.h" -# ifdef MOZ_ENABLE_DBUS +# if defined(MOZ_ENABLE_DBUS) # include "nsDBusRemoteServer.h" # include "nsDBusRemoteClient.h" -# else +# elif defined(MOZ_X11) # include "nsGTKRemoteServer.h" # include "nsXRemoteClient.h" +# else +# include "nsRemoteClient.h" # endif #elif defined(XP_WIN) # include "nsWinRemoteServer.h" @@ -102,8 +104,10 @@ RemoteResult nsRemoteService::StartClient(const char* aDesktopStartupID) { #ifdef MOZ_WIDGET_GTK # if defined(MOZ_ENABLE_DBUS) client = MakeUnique(); -# else +# elif defined(MOZ_X11) client = MakeUnique(); +# else + return REMOTE_NOT_FOUND; # endif #elif defined(XP_WIN) client = MakeUnique(); @@ -146,8 +150,10 @@ void nsRemoteService::StartupServer() { #ifdef MOZ_WIDGET_GTK # if defined(MOZ_ENABLE_DBUS) mRemoteServer = MakeUnique(); -# else +# elif defined(MOZ_X11) mRemoteServer = MakeUnique(); +# else + return; # endif #elif defined(XP_WIN) mRemoteServer = MakeUnique();