Commit b31896b2 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

GstPlugin: fix compilation if both HAVE_WIN32 and HAVE_SIGACTION are defined

Move _gst_plugin_fault_handler_is_setup into the ifdef block where it's
used. Fixes #578201.
parent 1f8eba61
...@@ -74,10 +74,6 @@ static gboolean _gst_plugin_inited; ...@@ -74,10 +74,6 @@ static gboolean _gst_plugin_inited;
/* static variables for segfault handling of plugin loading */ /* static variables for segfault handling of plugin loading */
static char *_gst_plugin_fault_handler_filename = NULL; static char *_gst_plugin_fault_handler_filename = NULL;
#ifndef HAVE_WIN32
static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
#endif
/* list of valid licenses. /* list of valid licenses.
* One of these must be specified or the plugin won't be loaded * One of these must be specified or the plugin won't be loaded
* Contact gstreamer-devel@lists.sourceforge.net if your license should be * Contact gstreamer-devel@lists.sourceforge.net if your license should be
...@@ -354,6 +350,7 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc) ...@@ -354,6 +350,7 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc)
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
static struct sigaction oldaction; static struct sigaction oldaction;
static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
/* /*
* _gst_plugin_fault_handler_restore: * _gst_plugin_fault_handler_restore:
...@@ -419,7 +416,7 @@ _gst_plugin_fault_handler_setup (void) ...@@ -419,7 +416,7 @@ _gst_plugin_fault_handler_setup (void)
sigaction (SIGSEGV, &action, &oldaction); sigaction (SIGSEGV, &action, &oldaction);
} }
#else #else /* !HAVE_SIGACTION */
static void static void
_gst_plugin_fault_handler_restore (void) _gst_plugin_fault_handler_restore (void)
{ {
...@@ -429,7 +426,7 @@ static void ...@@ -429,7 +426,7 @@ static void
_gst_plugin_fault_handler_setup (void) _gst_plugin_fault_handler_setup (void)
{ {
} }
#endif #endif /* HAVE_SIGACTION */
static void _gst_plugin_fault_handler_setup (); static void _gst_plugin_fault_handler_setup ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment