[fix] - definition clash of LOG_INFO and LOG_DEBUG between shairport.…

…h and syslog.h
xbmc · Nov 7, 2011 · b16f123 · b16f123
1 parent 3a2f4ea
commit b16f123
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 0 deletions.
diff --git a/lib/libshairport/007_fix_syslog_defines.patch b/lib/libshairport/007_fix_syslog_defines.patch
@@ -0,0 +1,24 @@
+--- src/shairport.h	2011-10-01 04:09:16.000000000 +0200
++++ src/shairport.h	2011-11-07 18:05:05.000000000 +0100
+@@ -16,10 +16,17 @@
+
+ #define HWID_SIZE 6
+ #define SHAIRPORT_LOG 1
+-#define LOG_INFO     1
+-#define LOG_DEBUG    5
+-#define LOG_DEBUG_V  6
+-#define LOG_DEBUG_VV 7
++
++#ifndef LOG_INFO
++#define LOG_INFO     5
++#endif
++
++#ifndef LOG_DEBUG
++#define LOG_DEBUG    6
++#endif
++
++#define LOG_DEBUG_V  7
++#define LOG_DEBUG_VV 8
+
+ struct shairbuffer
+ {
diff --git a/lib/libshairport/Makefile b/lib/libshairport/Makefile
@@ -42,6 +42,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(SOURCE); patch -p0 < ../004_fix_bad_access.patch
 	cd $(SOURCE); patch -p0 < ../005_fix_shutdown.patch
 	cd $(SOURCE); patch -p0 < ../006_no_printf.patch
+	cd $(SOURCE); patch -p0 < ../007_fix_syslog_defines.patch
 	cd $(SOURCE); autoreconf -vif
 	cd $(SOURCE); $(CONFIGURE)
 

diff --git a/tools/darwin/depends/libshairport/007_fix_syslog_defines.patch b/tools/darwin/depends/libshairport/007_fix_syslog_defines.patch
@@ -0,0 +1,24 @@
+--- src/shairport.h	2011-10-01 04:09:16.000000000 +0200
++++ src/shairport.h	2011-11-07 18:05:05.000000000 +0100
+@@ -16,10 +16,17 @@
+
+ #define HWID_SIZE 6
+ #define SHAIRPORT_LOG 1
+-#define LOG_INFO     1
+-#define LOG_DEBUG    5
+-#define LOG_DEBUG_V  6
+-#define LOG_DEBUG_VV 7
++
++#ifndef LOG_INFO
++#define LOG_INFO     5
++#endif
++
++#ifndef LOG_DEBUG
++#define LOG_DEBUG    6
++#endif
++
++#define LOG_DEBUG_V  7
++#define LOG_DEBUG_VV 8
+
+ struct shairbuffer
+ {
diff --git a/tools/darwin/depends/libshairport/Makefile b/tools/darwin/depends/libshairport/Makefile
@@ -28,6 +28,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(SOURCE); patch -p0 < ../004_fix_bad_access.patch
 	cd $(SOURCE); patch -p0 < ../005_fix_shutdown.patch
 	cd $(SOURCE); patch -p0 < ../006_no_printf.patch
+	cd $(SOURCE); patch -p0 < ../007_fix_syslog_defines.patch
 	cd $(SOURCE); autoreconf -vif
 	cd $(SOURCE); $(CONFIGURE)