mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: fix build on macOS

Browse source 
_Q_VALIDATE_MONITOR was defined twice because it wasn't declared
as extern in the header, so it would be defined as variable in all
included files. This doesn't seem to cause problems on Linux, but
seems to cause build failures on macOS.

Fixes #42
This commit is contained in:
Tim-Philipp Müller 2019-05-04 19:54:16 +01:00
parent a1881d4dc2
commit 751a6d756c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
validate/gst/validate/gst-validate-internal.h
View file

@ -33,7 +33,7 @@ extern G_GNUC_INTERNAL GstDebugCategory *gstvalidate_debug;
extern G_GNUC_INTERNAL GRegex *newline_regex; extern G_GNUC_INTERNAL GRegex *newline_regex;
extern G_GNUC_INTERNAL GstClockTime _priv_start_time; extern G_GNUC_INTERNAL GstClockTime _priv_start_time;
GQuark _Q_VALIDATE_MONITOR; extern G_GNUC_INTERNAL GQuark _Q_VALIDATE_MONITOR;
/* If an action type is 1 (TRUE) we also consider it is a config to keep backward compatibility */ /* If an action type is 1 (TRUE) we also consider it is a config to keep backward compatibility */
#define IS_CONFIG_ACTION_TYPE(type) (((type) & GST_VALIDATE_ACTION_TYPE_CONFIG) || ((type) == TRUE)) #define IS_CONFIG_ACTION_TYPE(type) (((type) & GST_VALIDATE_ACTION_TYPE_CONFIG) || ((type) == TRUE))

2
validate/gst/validate/validate.c
View file

@ -56,6 +56,8 @@ static GList *core_config = NULL;
static gboolean validate_initialized = FALSE; static gboolean validate_initialized = FALSE;
GstClockTime _priv_start_time; GstClockTime _priv_start_time;
GQuark _Q_VALIDATE_MONITOR;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
BOOL WINAPI BOOL WINAPI