Fix naming conflicts from syslog.h inclusion in lirc client header.

Increase squeezelite revision to 1049.
ralph-irving · Dec 19, 2017 · 33aa1d1 · 33aa1d1
1 parent 3028f38
commit 33aa1d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ir.c b/ir.c
@@ -21,12 +21,20 @@
 
 // ir thread - linux only
 
-#include "squeezelite.h"
-
 #if IR
 
 #include <lirc/lirc_client.h>
 
+/* Avoid name conflicts from syslog.h inclusion in lirc client header */
+#ifdef LOG_DEBUG
+#undef LOG_DEBUG
+#endif
+#ifdef LOG_INFO
+#undef LOG_INFO
+#endif
+
+#include "squeezelite.h"
+
 #define LIRC_CLIENT_ID "squeezelite"
 
 static log_level loglevel;

diff --git a/squeezelite.h b/squeezelite.h
@@ -24,7 +24,7 @@
 
 // make may define: PORTAUDIO, SELFPIPE, RESAMPLE, RESAMPLE_MP, VISEXPORT, GPIO, IR, DSD, LINKALL to influence build
 
-#define VERSION "v1.8.7-1048"
+#define VERSION "v1.8.7-1049"
 
 #if !defined(MODEL_NAME)
 #define MODEL_NAME SqueezeLite