aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Gregan <[email protected]>2012-08-24 14:56:22 +1200
committerMatthew Gregan <[email protected]>2012-08-24 14:56:22 +1200
commitf352bef061d794bb7edc9b91a3972aa5d2778dbc (patch)
tree6b0dc8dcc133936e838ee89f567b5a6441297d94
parent8ac4e6b347ba9f2da9ac7cee6d24bdf4e4179ac0 (diff)
downloadcubeb-f352bef061d794bb7edc9b91a3972aa5d2778dbc.tar.gz
cubeb-f352bef061d794bb7edc9b91a3972aa5d2778dbc.zip
add -Wno-unused to Makefile.am
-rw-r--r--Makefile.am2
-rw-r--r--src/cubeb_alsa.c11
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 5f465d7..980487e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.11 no-dist-gzip dist-xz subdir-objects
ACLOCAL_AMFLAGS = -I m4
INCLUDES = -I$(top_srcdir)/include -I.
-AM_CFLAGS = -ansi -pedantic -std=c99 -Wall -Wextra -Wno-long-long -O0 -g
+AM_CFLAGS = -ansi -pedantic -std=c99 -Wall -Wextra -Wno-long-long -O0 -g -Wno-unused
SUBDIRS = docs
diff --git a/src/cubeb_alsa.c b/src/cubeb_alsa.c
index 63528b4..9ff8a72 100644
--- a/src/cubeb_alsa.c
+++ b/src/cubeb_alsa.c
@@ -18,7 +18,6 @@
#define CUBEB_STREAM_MAX 16
#define CUBEB_WATCHDOG_MS 10000
-#define UNUSED __attribute__ ((__unused__))
#define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
@@ -471,8 +470,8 @@ cubeb_unregister_stream(cubeb_stream * stm)
}
static void
-silent_error_handler(char const * file UNUSED, int line UNUSED, char const * function UNUSED,
- int err UNUSED, char const * fmt UNUSED, ...)
+silent_error_handler(char const * file, int line, char const * function,
+ int err, char const * fmt, ...)
{
}
@@ -495,7 +494,7 @@ pcm_uses_pulseaudio_plugin(snd_pcm_t * pcm)
}
int
-cubeb_init(cubeb ** context, char const * context_name UNUSED)
+cubeb_init(cubeb ** context, char const * context_name)
{
cubeb * ctx;
int r;
@@ -552,7 +551,7 @@ cubeb_init(cubeb ** context, char const * context_name UNUSED)
}
char const *
-cubeb_get_backend_id(cubeb * ctx UNUSED)
+cubeb_get_backend_id(cubeb * ctx)
{
return "alsa";
}
@@ -581,7 +580,7 @@ cubeb_destroy(cubeb * ctx)
}
int
-cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name UNUSED,
+cubeb_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,
cubeb_stream_params stream_params, unsigned int latency,
cubeb_data_callback data_callback, cubeb_state_callback state_callback,
void * user_ptr)