Skip to content

Commit

Permalink
Sync back BMO#1825328
Browse files Browse the repository at this point in the history
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 <sguelton@mozilla.com>.
  • Loading branch information
padenot committed Apr 20, 2023
1 parent 479f8c5 commit 3ecf0c8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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) {
Expand Down

0 comments on commit 3ecf0c8

Please sign in to comment.