From 7da1dc6e1df129d0c04b3904c97d7544d7a3c88d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 18 May 2002 08:57:42 +0200
Subject: [PATCH] Fixed some function headers to make them compile with gcc 3.x

---
 CONTRIBUTORS |  6 ++++++
 HISTORY      | 10 +++++++++-
 menuitems.c  |  4 ++--
 osdbase.c    |  4 ++--
 ringbuffer.c |  4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b60404df..edee769c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -341,3 +341,9 @@ Andreas B
 
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
+
+Rudi Hofer (Rudi.Hofer@cadsoft.de)
+ for his help in keeping 'channels.conf' up to date
+
+Gregoire Favre <greg@ulima.unil.ch>
+ for fixing some function headers to make them compile with gcc 3.x
diff --git a/HISTORY b/HISTORY
index 91d66a51..180a1580 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1286,7 +1286,13 @@ Video Disk Recorder Revision History
 - Improved the [eid]syslog() macros, so that the LOG_... macros don't need to be
   given any more.
 
-2002-05-17: Version 1.1.3
+2002-05-18: Version 1.0.3
+
+- Updated 'Premiere Sport 2' in channels.conf (thanks to Rudi Hofer).
+- Fixed some function headers to make them compile with gcc 3.x (thanks to
+  Gregoire Favre).
+
+2002-05-18: Version 1.1.3
 
 - Improved the VDR Makefile to avoid a warning if the '.dependencies' file does
   not exist, and also using $(MAKE) to call recursive makes.
@@ -1296,3 +1302,5 @@ Video Disk Recorder Revision History
 - Improved the plugin Makefile to avoid a warning if the '.dependencies' file does
   not exist, and also using $(shell...) to get the version numbers. If you already have
   started a plugin project, you may want to change this in your Makefile accordingly.
+- Fixed some function headers to make them compile with gcc 3.x (thanks to
+  Gregoire Favre).
diff --git a/menuitems.c b/menuitems.c
index 3a6f94ea..4702bcfa 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.2 2002/05/11 10:49:45 kls Exp $
+ * $Id: menuitems.c 1.3 2002/05/18 08:53:59 kls Exp $
  */
 
 #include "menuitems.h"
@@ -471,7 +471,7 @@ void cMenuSetupPage::SetPlugin(cPlugin *Plugin)
   SetSection(buf);
 }
 
-void cMenuSetupPage::SetupStore(const char *Name, const char *Value = NULL)
+void cMenuSetupPage::SetupStore(const char *Name, const char *Value)
 {
   if (plugin)
      plugin->SetupStore(Name, Value);
diff --git a/osdbase.c b/osdbase.c
index 1e51940d..20e331fb 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.2 2002/05/13 16:30:59 kls Exp $
+ * $Id: osdbase.c 1.3 2002/05/18 08:54:31 kls Exp $
  */
 
 #include "osdbase.h"
@@ -442,7 +442,7 @@ eDvbFont cOsd::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-void cOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
+void cOsd::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg, tWindowHandle Window)
 {
   cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)
diff --git a/ringbuffer.c b/ringbuffer.c
index 3918297d..d7562f96 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.7 2002/05/13 16:31:46 kls Exp $
+ * $Id: ringbuffer.c 1.8 2002/05/18 08:54:52 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -239,7 +239,7 @@ cFrame::~cFrame()
 
 // --- cRingBufferFrame ------------------------------------------------------
 
-cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics = false)
+cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics)
 :cRingBuffer(Size, Statistics)
 {
   head = NULL;