Fixed some function headers to make them compile with gcc 3.x

5 files changed, 11 insertions, 6 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f809a5a3..a6329b9a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -332,3 +332,6 @@ Andreas Böttger <fboettger@t-online.de>
 
 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 1dfb1e0f..bbdd7904 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1246,3 +1246,5 @@ Video Disk Recorder Revision History
 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).
diff --git a/config.h b/config.h
index 0f3420e0..07ba1ae8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.112 2002/04/26 13:56:30 kls Exp $
+ * $Id: config.h 1.112.1.1 2002/05/18 08:41:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.2"
+#define VDRVERSION "1.0.3"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbosd.c b/dvbosd.c
index eb962613..67c7fbc0 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.13 2002/04/13 11:34:48 kls Exp $
+ * $Id: dvbosd.c 1.13.1.1 2002/05/18 08:44:46 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -528,7 +528,7 @@ eDvbFont cDvbOsd::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
+void cDvbOsd::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 88b515b4..4c7fc27c 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.6 2002/04/19 12:38:44 kls Exp $
+ * $Id: ringbuffer.c 1.6.1.1 2002/05/18 08:45:09 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;