From: <co...@ke...> - 2010-03-22 11:30:27
|
Module: gst-plugins-bad Branch: master Commit: 010789159d7bf274e11f0b4bec5c66543ad1220f URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=010789159d7bf274e11f0b4bec5c66543ad1220f Author: Benjamin Otte <ot...@re...> Date: Mon Mar 22 12:30:01 2010 +0100 Add -Wundef and fix the warnings --- configure.ac | 4 ++-- ext/ladspa/gstladspa.c | 16 ++++++++-------- ext/mpeg2enc/gstmpeg2encoptions.cc | 2 +- gst/nsf/fmopl.h | 1 + tests/check/pipelines/metadata.c | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 08895d4..a79c178 100644 --- a/configure.ac +++ b/configure.ac @@ -240,11 +240,11 @@ AG_GST_SET_PLUGINDIR dnl define an ERROR_CFLAGS Makefile variable AG_GST_SET_ERROR_CFLAGS($GST_GIT, [ - -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls ]) + -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef ]) dnl define an ERROR_CXXFLAGS Makefile variable AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [ - -Wmissing-declarations -Wredundant-decls ]) + -Wmissing-declarations -Wredundant-decls -Wundef ]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index c10c5bb..6537c7c 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -38,7 +38,7 @@ #include "gstladspa.h" #include <ladspa.h> /* main ladspa sdk include file */ -#if HAVE_LRDF +#ifdef HAVE_LRDF #include <lrdf.h> #endif @@ -84,7 +84,7 @@ gst_ladspa_base_init (gpointer g_class) guint j, audio_in_count, audio_out_count, control_in_count, control_out_count; const gchar *klass_tags; gchar *longname, *author; -#if HAVE_LRDF +#ifdef HAVE_LRDF gchar *uri; #endif gchar *extra_klass_tags = NULL; @@ -146,7 +146,7 @@ gst_ladspa_base_init (gpointer g_class) if (!author) author = g_strdup ("no author available"); -#if HAVE_LRDF +#ifdef HAVE_LRDF /* libldrf support, we want to get extra class information here */ uri = g_strdup_printf (LADSPA_BASE "%ld", desc->UniqueID); if (uri) { @@ -232,7 +232,7 @@ gst_ladspa_base_init (gpointer g_class) } else klass_tags = "Filter/Effect/Audio/LADSPA"; -#if HAVE_LRDF +#ifdef HAVE_LRDF if (extra_klass_tags) { char *s = g_strconcat (klass_tags, extra_klass_tags, NULL); g_free (extra_klass_tags); @@ -716,7 +716,7 @@ ladspa_describe_plugin (LADSPA_Descriptor_Function descriptor_function) } } -#if HAVE_LRDF +#ifdef HAVE_LRDF static gboolean ladspa_rdf_directory_search (const char *dir_name) { @@ -798,7 +798,7 @@ ladspa_plugin_path_search (void) gchar **paths; gint i, j, path_entries; gboolean res = FALSE, skip; -#if HAVE_LRDF +#ifdef HAVE_LRDF gchar *pos, *prefix, *rdf_path; #endif @@ -815,7 +815,7 @@ ladspa_plugin_path_search (void) path_entries = g_strv_length (paths); GST_INFO ("%d dirs in search paths \"%s\"", path_entries, ladspa_path); -#if HAVE_LRDF +#ifdef HAVE_LRDF for (i = 0; i < path_entries; i++) { skip = FALSE; for (j = 0; j < i; j++) { @@ -871,7 +871,7 @@ plugin_init (GstPlugin * plugin) "LADSPA_PATH", GST_LADSPA_DEFAULT_PATH, NULL, GST_PLUGIN_DEPENDENCY_FLAG_NONE); -#if HAVE_LRDF +#ifdef HAVE_LRDF lrdf_init (); #endif diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc index 7db8b38..374f4d4 100644 --- a/ext/mpeg2enc/gstmpeg2encoptions.cc +++ b/ext/mpeg2enc/gstmpeg2encoptions.cc @@ -24,7 +24,7 @@ #endif #include "gstmpeg2encoptions.hh" -#if WIN32 +#ifdef WIN32 # include <windows.h> //For GetSystemInfo #endif diff --git a/gst/nsf/fmopl.h b/gst/nsf/fmopl.h index 4d87895..ccaa88f 100644 --- a/gst/nsf/fmopl.h +++ b/gst/nsf/fmopl.h @@ -4,6 +4,7 @@ #define HAS_YM3812 1 typedef signed short int FMSAMPLE; +#define HAS_Y8950 0 #define BUILD_YM3812 (HAS_YM3812) #define BUILD_YM3526 (HAS_YM3526) diff --git a/tests/check/pipelines/metadata.c b/tests/check/pipelines/metadata.c index d8117d0..56a9660 100644 --- a/tests/check/pipelines/metadata.c +++ b/tests/check/pipelines/metadata.c @@ -194,7 +194,7 @@ GST_START_TEST (test_common_tags) * And since we don't have any programmatic feedback on whether * a tag is properly handled or not... we need to do this kind * of hack. */ -#if HAVE_XMP +#ifdef HAVE_XMP test_tags ("taglist,title=\"test image\""); #endif } |