From 49ed755309a181b5953701b943d28b1f2f0c1c15 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 5 Feb 2018 13:14:50 +0100
Subject: [PATCH] Use PROGNAME_MIXER for mixer(1)

---
 src/main.c  | 8 ++++----
 src/mixer.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main.c b/src/main.c
index 46964a5..4292b7b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,8 +39,8 @@
 
 
 /* constants */
-#ifndef PROGNAME
-# define PROGNAME	"mixer"
+#ifndef PROGNAME_MIXER
+# define PROGNAME_MIXER	"mixer"
 #endif
 #ifndef PREFIX
 # define PREFIX		"/usr/local"
@@ -77,7 +77,7 @@ static int _mixer(char const * device, MixerLayout layout, gboolean embedded)
 /* error */
 static int _error(char const * message, int ret)
 {
-	fputs(PROGNAME ": ", stderr);
+	fputs(PROGNAME_MIXER ": ", stderr);
 	perror(message);
 	return ret;
 }
@@ -91,7 +91,7 @@ static int _usage(void)
 "  -T	Show the classes in separate tabs\n"
 "  -V	Show the classes on top of each other\n"
 "  -d	The mixer device to use\n"
-"  -x	Enable embedded mode\n"), PROGNAME);
+"  -x	Enable embedded mode\n"), PROGNAME_MIXER);
 	return 1;
 }
 
diff --git a/src/mixer.c b/src/mixer.c
index e3bc114..15920cd 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -63,8 +63,8 @@
 
 
 /* constants */
-#ifndef PROGNAME
-# define PROGNAME	"mixer"
+#ifndef PROGNAME_MIXER
+# define PROGNAME_MIXER	"mixer"
 #endif
 
 
@@ -973,7 +973,7 @@ static int _mixer_error(Mixer * mixer, char const * message, int ret)
 
 static int _error_text(char const * message, int ret)
 {
-	fputs(PROGNAME ": ", stderr);
+	fputs(PROGNAME_MIXER ": ", stderr);
 	perror(message);
 	return ret;
 }