summaryrefslogtreecommitdiffstats
path: root/media/libcubeb/src/cubeb_utils_unix.h
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-03 14:35:17 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-03 14:35:17 -0500
commita57983a2176afb4bab3c22efa6a24d39f3c11163 (patch)
tree56dbcb66e07d997d817e40c1fd8005ee75142e8b /media/libcubeb/src/cubeb_utils_unix.h
parent6513e41cb75e64384f35470d59ad6a4f88092e82 (diff)
parent1960d6e08a949ceed50e6a18240d40a7ecee879c (diff)
downloadUXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar
UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.gz
UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.lz
UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.xz
UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.zip
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/libcubeb/src/cubeb_utils_unix.h')
-rw-r--r--media/libcubeb/src/cubeb_utils_unix.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libcubeb/src/cubeb_utils_unix.h b/media/libcubeb/src/cubeb_utils_unix.h
index 4876d015f..80219d58b 100644
--- a/media/libcubeb/src/cubeb_utils_unix.h
+++ b/media/libcubeb/src/cubeb_utils_unix.h
@@ -48,7 +48,7 @@ public:
#endif
}
- void lock()
+ void enter()
{
#ifndef NDEBUG
int r =
@@ -59,7 +59,7 @@ public:
#endif
}
- void unlock()
+ void leave()
{
#ifndef NDEBUG
int r =