diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
| commit | 87b624f5d5233af1727b683c6ace1e957d837ed4 (patch) | |
| tree | 98b18a6e20721b9b9063779d7bc0b38457dffe43 | |
| parent | e1efc71ad3389ef8b2bdcf8dba5dc124c9a5bf7f (diff) | |
| parent | 443e96381a0e24d9c22578ba6f7fb96de1814994 (diff) | |
| download | mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.gz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.xz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.zip | |
Merge branch 'v0.16.x'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/input/curl_input_plugin.c | 2 | ||||
| -rw-r--r-- | src/output/pulse_output_plugin.c | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index e6f681766..41b905be9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects -AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS) +AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS) AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"' @@ -22,6 +22,7 @@ ver 0.17 (2011/??/??) ver 0.16.5 (2010/??/??) +* configure.ac: disable assertions in the non-debugging build * pcm_format: fix 32-to-24 bit conversion (the "silence" bug) * input: - rewind: reduce heap usage diff --git a/configure.ac b/configure.ac index 63b1e5133..5e325265c 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,9 @@ PKG_PROG_PKG_CONFIG dnl --------------------------------------------------------------------------- dnl Declare Variables dnl --------------------------------------------------------------------------- +AC_SUBST(AM_CPPFLAGS,"") AC_SUBST(AM_CFLAGS,"") +AC_SUBST(AM_CXXFLAGS,"") AC_SUBST(MPD_LIBS) AC_SUBST(MPD_CFLAGS) @@ -1469,10 +1471,9 @@ dnl CFLAGS dnl --------------------------------------------------------------------------- dnl ---------------------------------- debug ---------------------------------- -#if test "x$enable_debug" = xno; then - # don't set NDEBUG for now, until MPD is stable - #AM_CFLAGS="$AM_CFLAGS -DNDEBUG" -#fi +if test "x$enable_debug" = xno; then + AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG" +fi dnl ----------------------------------- GCC ----------------------------------- if test x$GCC = xyes @@ -1497,6 +1498,7 @@ fi dnl ---------------------------- warnings as errors --------------------------- if test "x$enable_werror" = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror -pedantic-errors" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" fi dnl --------------------------------------------------------------------------- diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index d4c116136..dfe2e53c5 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -780,7 +780,7 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data) assert(buffer->consumed <= buffer->size); - g_free(data); + g_free(buffer); } static void diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c index 9825785ee..ecd6a487a 100644 --- a/src/output/pulse_output_plugin.c +++ b/src/output/pulse_output_plugin.c @@ -72,7 +72,8 @@ pulse_output_set_mixer(struct pulse_output *po, struct pulse_mixer *pm) } void -pulse_output_clear_mixer(struct pulse_output *po, struct pulse_mixer *pm) +pulse_output_clear_mixer(struct pulse_output *po, + G_GNUC_UNUSED struct pulse_mixer *pm) { assert(po != NULL); assert(pm != NULL); |