From: Bernhard Froehlich <decke@bluelife.at>
Date: Fri, 24 May 2013 17:31:10 +0000 (+0200)
Subject: Convert all #ifdef ENABLE_EPOLL to #if ENABLE_EPOLL
X-Git-Tag: v3.9~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae7d281898ce995e08f25ecac0951b5c252659e8;p=thirdparty%2Ftvheadend.git

Convert all #ifdef ENABLE_EPOLL to #if ENABLE_EPOLL
---

diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index 2db71b9c8..ff10cb1d7 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -48,7 +48,7 @@
 #include "diseqc.h"
 #include "atomic.h"
 
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
 #include <sys/epoll.h>
 #elif ENABLE_KQUEUE
 #include <sys/event.h>
@@ -1029,7 +1029,7 @@ dvb_adapter_input_dvr(void *aux)
   int fd = -1, i, r, c, nfds, dmx = -1;
   uint8_t tsb[188 * 10];
   service_t *t;
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   int delay = 10;
   int efd;
   struct epoll_event ev;
@@ -1052,7 +1052,7 @@ dvb_adapter_input_dvr(void *aux)
     return NULL;
   }
 
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   /* Create poll */
   efd = epoll_create(2);
   memset(&ev, 0, sizeof(ev));
@@ -1074,7 +1074,7 @@ dvb_adapter_input_dvr(void *aux)
   while(1) {
 
     /* Wait for input */
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
     nfds = epoll_wait(efd, &ev, 1, delay);
 
     /* No data */
@@ -1166,7 +1166,7 @@ dvb_adapter_input_dvr(void *aux)
 
   if(dmx != -1)
     close(dmx);
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   close(efd);
 #elif ENABLE_KQUEUE
   close(kfd);
diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c
index bbf3bf741..b36af0034 100644
--- a/src/timeshift/timeshift_reader.c
+++ b/src/timeshift/timeshift_reader.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
 #include <sys/epoll.h>
 #elif ENABLE_KQUEUE
 #include <sys/event.h>
@@ -416,7 +416,7 @@ void *timeshift_reader ( void *p )
   timeshift_index_iframe_t *tsi = NULL;
   streaming_skip_t *skip = NULL;
   time_t last_status = 0;
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   int efd;
   struct epoll_event ev = { 0 };
 #elif ENABLE_KQUEUE
@@ -424,7 +424,7 @@ void *timeshift_reader ( void *p )
   struct kevent ke;
 #endif
 
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   /* Poll */
   efd        = epoll_create(1);
   ev.events  = EPOLLIN;
@@ -447,7 +447,7 @@ void *timeshift_reader ( void *p )
 
     /* Wait for data */
     if(wait)
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
       nfds = epoll_wait(efd, &ev, 1, wait);
 #elif ENABLE_KQUEUE
       nfds = kevent(kfd, NULL, 0, &ke, 1, NULL);
@@ -826,7 +826,7 @@ void *timeshift_reader ( void *p )
   }
 
   /* Cleanup */
-#ifdef ENABLE_EPOLL
+#if ENABLE_EPOLL
   close(efd);
 #elif ENABLE_KQUEUE
   close(kfd);