Backed out changeset 2fa9fd80ad28 (bug 1680975) for causing build bus…

…tages on CubebUtils.cpp CLOSED TREE
iaxat · Jul 12, 2022 · 980eeae · 980eeae
1 parent f17ba6b
commit 980eeae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
@@ -25,8 +25,6 @@
 #include "prdtoa.h"
 #include <algorithm>
 #include <stdint.h>
-#include <unistd.h>
-
 #ifdef MOZ_WIDGET_ANDROID
 #  include "mozilla/java/GeckoAppShellWrappers.h"
 #endif
@@ -64,8 +62,7 @@
 #define PREF_AUDIOIPC_SHM_AREA_SIZE "media.audioipc.shm_area_size"
 
 #if (defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)) || \
-    defined(XP_MACOSX) || defined(XP_FREEBSD) ||           \
-    (defined(XP_WIN) && !defined(_ARM64_))
+    defined(XP_MACOSX) || (defined(XP_WIN) && !defined(_ARM64_))
 #  define MOZ_CUBEB_REMOTING
 #endif
 

diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
@@ -29,7 +29,7 @@ if CONFIG['MOZ_RUST_SIMD']:
 
 # This feature is not yet supported on all platforms, and this check needs to
 # match MOZ_CUBEB_REMOTING in CubebUtils.cpp.
-if (CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android') or CONFIG['OS_ARCH'] == 'Darwin' or CONFIG['OS_ARCH'] == 'FreeBSD' or (CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CPU_ARCH'] != 'aarch64'):
+if (CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android') or CONFIG['OS_ARCH'] == 'Darwin' or (CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CPU_ARCH'] != 'aarch64'):
     gkrust_features += ['cubeb-remoting']
 
 if CONFIG['MOZ_MEMORY']: