From a767ff9c5d65522700841f0a6fb866258deb56b1 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 22 May 2004 11:29:52 +0200 Subject: [PATCH] Fixed some issues with gcc 3.4 --- CONTRIBUTORS | 4 ++++ HISTORY | 2 ++ config.h | 4 ++-- plugin.c | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 48e1e229..c4ef8363 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -670,6 +670,7 @@ Marcel Wiesweg for fixing testing for matching section filters in case they are turned off for adding 'libsi' include files to the 'include' directory, so that plugins can use them + for his help in fixing some issues with gcc 3.4 Torsten Herz for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu @@ -974,3 +975,6 @@ John Kennedy Drazen Dupor for translating OSD texts to the Croatian language + +Prakash K. Cheemplavam + for fixing some issues with gcc 3.4 diff --git a/HISTORY b/HISTORY index 8cbf9e44..721aa417 100644 --- a/HISTORY +++ b/HISTORY @@ -2810,3 +2810,5 @@ Video Disk Recorder Revision History - Fixed a crash when switching the skin and having selected a non-default theme that is not available for the newly selected skin (thanks to Sascha Volkenandt for reporting this one). +- Fixed some issues with gcc 3.4 (thanks to Prakash K. Cheemplavam and Marcel + Wiesweg). diff --git a/config.h b/config.h index af3b2ae0..18f3aeaf 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.194 2004/05/22 10:33:46 kls Exp $ + * $Id: config.h 1.195 2004/05/22 11:29:52 kls Exp $ */ #ifndef __CONFIG_H @@ -140,7 +140,7 @@ public: bool Save(void) { bool result = true; - T *l = (T *)First(); + T *l = (T *)this->First(); cSafeFile f(fileName); if (f.Open()) { while (l) { diff --git a/plugin.c b/plugin.c index a0d27011..7f211b3c 100644 --- a/plugin.c +++ b/plugin.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: plugin.c 1.10 2003/08/30 14:52:58 kls Exp $ + * $Id: plugin.c 1.11 2004/05/22 11:25:22 kls Exp $ */ #include "plugin.h" @@ -162,7 +162,7 @@ bool cDll::Load(bool Log) const char *error = dlerror(); if (!error) { void *(*creator)(void); - (void *)creator = dlsym(handle, "VDRPluginCreator"); + creator = (void *(*)(void))dlsym(handle, "VDRPluginCreator"); if (!(error = dlerror())) plugin = (cPlugin *)creator(); }