From ca32dc16bded4089e203d23d86cbaf2a75e7a0b5 Mon Sep 17 00:00:00 2001
From: horchi <vdr@jwendel.de>
Date: Sun, 11 Jun 2017 18:15:37 +0200
Subject: fixed macro for vdr 2.2.0

---
 lib/vdrlocks.h | 14 ++++++++++++--
 update.c       |  6 ------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/vdrlocks.h b/lib/vdrlocks.h
index d499bc7..a3a1f2b 100644
--- a/lib/vdrlocks.h
+++ b/lib/vdrlocks.h
@@ -13,21 +13,31 @@
 #  include <vdr/config.h>
 #  include <vdr/tools.h>
 
+//***************************************************************************
+// Timer List Lock Macros
+//***************************************************************************
 
 #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
 #  define GET_TIMERS_READ(name) USE_LIST_LOCK_READ(Timers);  \
    const cTimers* name = Timers;
 #else
-#  define GET_TIMERS_READ cTimers* timers = &Timers;
+#  define GET_TIMERS_READ(name) cTimers* name = &Timers;
 #endif
 
 #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
 #  define GET_TIMERS_WRITE(name) USE_LIST_LOCK_WRITE(Timers);   \
    cTimers* name = Timers;
 #else
-#  define GET_TIMERS_READ cTimers* timers = &Timers;
+#  define GET_TIMERS_WRITE(name) cTimers* name = &Timers;
 #endif
 
+
+//***************************************************************************
+// Channel List Lock Macros
+//***************************************************************************
+
+
+
 //***************************************************************************
 #  endif // VDR_PLUGIN
 
diff --git a/update.c b/update.c
index a3cbd3f..d51ca32 100644
--- a/update.c
+++ b/update.c
@@ -1625,13 +1625,7 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries)
 
    if (timerChanges)
    {
-//#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
       GET_TIMERS_WRITE(timers);
-      // LOCK_TIMERS_WRITE;
-      // cTimers* timers = Timers;
-// #else
-//       cTimers* timers = &Timers;
-// #endif
       timers->SetModified();
    }
 
-- 
cgit v1.2.3