CID:469 PW.BAD_MACRO_REDEF

	* src/media/media-sox.c: undef UNUSED before including media-sox.h
	because sox.h conflicts with lisp.h definition. This should have
	as proper fix a SXE_UNUSED macro... For a later time.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/src/media/media-sox.c b/src/media/media-sox.c
index 52e8844..0237366 100644 (file)
--- a/src/media/media-sox.c
+++ b/src/media/media-sox.c
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /* Synched up with: Not in FSF. */
 
 #include <config.h>
+#include "lisp.h"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -28,7 +29,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include <errno.h>
 #include <string.h>
 
-#include "lisp.h"
+/* 
+lisp.h defined UNUSED which also gets defined in some versions of SoX
+in an incompatible fashion.  We don't need that macro here...
+*/
+#undef UNUSED 
 #include "media-sox.h"
 
 #define MYSELF MDRIVER_SOX