diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-04-17 09:17:40 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-04-17 09:17:40 +0100 |
commit | b31896b2af77271ec6d7214280240aba97c1e65a (patch) | |
tree | e24f10659736245507a5e2bba8b02f0d0f050bfd | |
parent | 1f8eba611a63f45766c38c640288e42b27b10bd4 (diff) |
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.
-rw-r--r-- | gst/gstplugin.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gst/gstplugin.c b/gst/gstplugin.c index a7cd8671e2..8105d74302 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -74,10 +74,6 @@ static gboolean _gst_plugin_inited; /* static variables for segfault handling of plugin loading */ 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. * One of these must be specified or the plugin won't be loaded * Contact gstreamer-devel@lists.sourceforge.net if your license should be @@ -354,6 +350,7 @@ gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc) #ifdef HAVE_SIGACTION static struct sigaction oldaction; +static gboolean _gst_plugin_fault_handler_is_setup = FALSE; /* * _gst_plugin_fault_handler_restore: @@ -419,7 +416,7 @@ _gst_plugin_fault_handler_setup (void) sigaction (SIGSEGV, &action, &oldaction); } -#else +#else /* !HAVE_SIGACTION */ static void _gst_plugin_fault_handler_restore (void) { @@ -429,7 +426,7 @@ static void _gst_plugin_fault_handler_setup (void) { } -#endif +#endif /* HAVE_SIGACTION */ static void _gst_plugin_fault_handler_setup (); |