aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPaul Adenot <[email protected]>2023-04-20 14:07:40 +0200
committerPaul Adenot <[email protected]>2023-04-20 14:07:44 +0200
commit3ecf0c8f83a91d0966aa1a1916c3e545b041be4f (patch)
treef3ab9faf4e51fe77c7eb43990ba9286a1d03cb61
parent479f8c5dec2c31ced12dbc4c64ff86ffb4ed50b7 (diff)
downloadcubeb-3ecf0c8f83a91d0966aa1a1916c3e545b041be4f.tar.gz
cubeb-3ecf0c8f83a91d0966aa1a1916c3e545b041be4f.zip
Sync back BMO#1825328
https://bugzilla.mozilla.org/show_bug.cgi?id=1825328 landed in Firefox without going through upstream. It's necessary to build in an environment where gtests are all compiled in the same executable. Original patch by serge-sans-paille <[email protected]>.
-rw-r--r--test/common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/common.h b/test/common.h
index f085d81..98e9f90 100644
--- a/test/common.h
+++ b/test/common.h
@@ -28,7 +28,7 @@ ARRAY_LENGTH(T(&)[N])
return N;
}
-void delay(unsigned int ms)
+inline void delay(unsigned int ms)
{
#if defined(_WIN32)
Sleep(ms);
@@ -48,7 +48,7 @@ typedef struct {
uint32_t const layout;
} layout_info;
-int has_available_input_device(cubeb * ctx)
+inline int has_available_input_device(cubeb * ctx)
{
cubeb_device_collection devices;
int input_device_available = 0;
@@ -80,7 +80,7 @@ int has_available_input_device(cubeb * ctx)
return !!input_device_available;
}
-void print_log(const char * msg, ...)
+inline void print_log(const char * msg, ...)
{
va_list args;
va_start(args, msg);
@@ -91,7 +91,7 @@ void print_log(const char * msg, ...)
/** Initialize cubeb with backend override.
* Create call cubeb_init passing value for CUBEB_BACKEND env var as
* override. */
-int common_init(cubeb ** ctx, char const * ctx_name)
+inline int common_init(cubeb ** ctx, char const * ctx_name)
{
#ifdef ENABLE_NORMAL_LOG
if (cubeb_set_log_callback(CUBEB_LOG_NORMAL, print_log) != CUBEB_OK) {