summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2011-05-15 21:44:08 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2011-05-15 21:44:08 +0200
commitee382b4ad2d815384e57edd418b8e31f74287e76 (patch)
treecd870637ff108ef6ff94d1881b7c6e66dd12ca7d
parent464552dd91a170f5e6c69650a6df1af871a2ad1a (diff)
downloadvdr-ee382b4ad2d815384e57edd418b8e31f74287e76.tar.gz
vdr-ee382b4ad2d815384e57edd418b8e31f74287e76.tar.bz2
Avoiding a gcc 4.6 compiler error in the skincurses plugin
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--PLUGINS/src/skincurses/HISTORY4
-rw-r--r--PLUGINS/src/skincurses/skincurses.c6
4 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index baef5ecb..e469c169 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2257,6 +2257,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
for reporting unneeded include files <linux/dvb/dmx.h> and <time.h> in remux.h
for a patch that added a workaround for the broken linux-dvb driver header files
for reporting a faulty "frame duration" instead of "frame rate" in vdr.5
+ for avoiding a gcc 4.6 compiler error in the skincurses plugin.
Helge Lenz <h.lenz@gmx.de>
for reporting a bug in setting the 'Delta' parameter when calling the shutdown
diff --git a/HISTORY b/HISTORY
index 3dff3b5a..69233209 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6607,7 +6607,8 @@ Video Disk Recorder Revision History
- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
Nissl).
-2011-04-29: Version 1.7.19
+2011-05-15: Version 1.7.19
- Fixed cString's operator=(const char *String) in case the given string is the
same as the existing one (thanks to Dirk Leber).
+- Avoiding a gcc 4.6 compiler error in the skincurses plugin (thanks to Tobias Grimm).
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 9e3377f3..90dfbb7d 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -88,3 +88,7 @@ VDR Plugin 'skincurses' Revision History
2010-02-28: Version 0.1.9
- Added Lithuanian language translations (thanks to Valdemaras Pipiras).
+
+2011-05-15: Version 0.1.10
+
+- Avoiding a gcc 4.6 compiler error (thanks to Tobias Grimm).
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 84076cd4..11fead5f 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: skincurses.c 2.5 2011/01/04 08:52:03 kls Exp $
+ * $Id: skincurses.c 2.6 2011/05/15 21:41:47 kls Exp $
*/
#include <ncurses.h>
@@ -11,7 +11,7 @@
#include <vdr/plugin.h>
#include <vdr/skins.h>
-static const char *VERSION = "0.1.9";
+static const char *VERSION = "0.1.10";
static const char *DESCRIPTION = trNOOP("A text only skin");
static const char *MAINMENUENTRY = NULL;
@@ -26,7 +26,7 @@ public:
virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
};
-static const cCursesFont Font;
+static const cCursesFont Font = cCursesFont(); // w/o the '= cCursesFont()' gcc 4.6 complains - can anybody explain why this is necessary?
// --- cCursesOsd ------------------------------------------------------------