diff options
| author | Memphiz <memphis@machzwo.de> | 2011-11-07 18:10:57 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2011-11-07 18:10:57 +0100 |
| commit | b16f1239f4986b1ac55282a3125a1d88dc2c3344 (patch) | |
| tree | ff985a259b110862d26ea379dbe69d4c908bb2a4 /lib | |
| parent | 3a2f4ea0d9208a7a7356893c804d546327761e88 (diff) | |
[fix] - definition clash of LOG_INFO and LOG_DEBUG between shairport.h and syslog.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libshairport/007_fix_syslog_defines.patch | 24 | ||||
| -rw-r--r-- | lib/libshairport/Makefile | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/libshairport/007_fix_syslog_defines.patch b/lib/libshairport/007_fix_syslog_defines.patch new file mode 100644 index 0000000000..4d9b834f9c --- /dev/null +++ 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 index 588734f19e..aaa036c76f 100644 --- 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) |