From: Sven Wegener <sven.wegener@stealer.net>
Date: Mon, 9 Nov 2015 19:44:23 +0000 (+0100)
Subject: ENABLE_* macros are always defined
X-Git-Tag: v4.2.1~1620
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f05c850e7f1e38a82f5ac6d199f4e6e1070867b3;p=thirdparty%2Ftvheadend.git

ENABLE_* macros are always defined

This fixes a rare compile error and the "Don't keep" cache policy not
working.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
---

diff --git a/src/muxer.c b/src/muxer.c
index d8a0fd92d..1df4efb13 100644
--- a/src/muxer.c
+++ b/src/muxer.c
@@ -306,7 +306,7 @@ muxer_cache_update(muxer_t *m, int fd, off_t pos, size_t size)
   case MC_CACHE_DONTKEEP:
 #if defined(PLATFORM_DARWIN)
     fcntl(fd, F_NOCACHE, 1);
-#elif !defined(ENABLE_ANDROID)
+#elif !ENABLE_ANDROID
     posix_fadvise(fd, pos, size, POSIX_FADV_DONTNEED);
 #endif
     break;
diff --git a/src/trap.c b/src/trap.c
index 78e160a4a..af3f2cd30 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -148,7 +148,7 @@ traphandler(int sig, siginfo_t *si, void *UC)
   int nframes = backtrace(frames, MAXFRAMES);
   Dl_info dli;
 #endif
-#if defined(NGREG) || defined(ENABLE_EXECINFO)
+#if defined(NGREG) || ENABLE_EXECINFO
   int i;
 #endif
   const char *reason = NULL;