From a91d687a1a16317e71e83cee4b48a1cbc57206f2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 8 Oct 2024 08:09:48 +0200
Subject: [PATCH] Removed defining DEPRECATED_* macros with value 0, because
 this is the preprocessor's default

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 5 +++++
 epg.h        | 5 +----
 filter.h     | 6 +-----
 player.h     | 5 +----
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 89dc7fed..061f9823 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2845,6 +2845,8 @@ Winfried K
  for adding a missing initialization of cChannel::nameSourceMode
  for suggesting to make APIVERSION a simple number, independent from VDRVERSION
  for reporting a compiler warning with gcc 14.1.0
+ for suggesting to remove defining DEPRECATED_* macros with value 0, because this
+ is the preprocessor's default
 
 Hans-Werner Hilse <hilse@web.de>
  for adding the command line option --userdump to enable core dumps in case VDR
diff --git a/HISTORY b/HISTORY
index 16c58b10..d6f40f98 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10020,3 +10020,8 @@ Video Disk Recorder Revision History
 - Increased the bpp of cProgressBar to 4 to handle all different colors.
 - Fixed a problem with duplicate events if they are moved to a lower table ID and at the
   same time get a new event ID (reported by Markus Ehrnsperger).
+
+2024-10-08:
+
+- Removed defining DEPRECATED_* macros with value 0, because this is the preprocessor's
+  default (suggested by Winfried Köhler).
diff --git a/epg.h b/epg.h
index 96bb31b0..0d274bb8 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 5.6 2024/09/14 14:17:12 kls Exp $
+ * $Id: epg.h 5.7 2024/10/08 08:09:48 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -186,9 +186,6 @@ public:
   const cList<cEvent> *Events(void) const { return &events; }
   const cEvent *GetPresentEvent(void) const;
   const cEvent *GetFollowingEvent(void) const;
-#ifndef DEPRECATED_SCHEDULE_GET_EVENT
-#define DEPRECATED_SCHEDULE_GET_EVENT 0
-#endif
 #if DEPRECATED_SCHEDULE_GET_EVENT
   [[deprecated("see HISTORY, version 2.5.2")]]
   const cEvent *GetEvent(tEventID EventID, time_t StartTime = 0) const;
diff --git a/filter.h b/filter.h
index 7306a17c..1a25e796 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 5.3 2024/09/09 22:15:59 kls Exp $
+ * $Id: filter.h 5.4 2024/10/08 08:09:48 kls Exp $
  */
 
 #ifndef __FILTER_H
@@ -13,10 +13,6 @@
 #include <sys/types.h>
 #include "tools.h"
 
-#ifndef DEPRECATED_SECTIONSYNCER_SYNC_REPEAT
-#define DEPRECATED_SECTIONSYNCER_SYNC_REPEAT 0
-#endif
-
 class cSectionSyncer {
 private:
   int currentVersion;
diff --git a/player.h b/player.h
index a17b6006..882da7c7 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 5.4 2024/09/19 09:49:02 kls Exp $
+ * $Id: player.h 5.5 2024/10/08 08:09:48 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -117,9 +117,6 @@ public:
   static void Launch(cControl *Control);
   static void Attach(void);
   static void Shutdown(void);
-#ifndef DEPRECATED_CCONTROL
-#define DEPRECATED_CCONTROL 0
-#endif
 #if DEPRECATED_CCONTROL
   [[deprecated("see HISTORY, version 2.4.2")]]
   static cControl *Control(bool Hidden = false);