Mailing List archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[vdr] Re: VDR developer version 1.3.6



Hi,

I just tried to make a quick compilation fix for gcc3.4. I am not sure, whether the fixes are right, so please take a look and then merge. It compiles, but I have not done a test-run.

Cheers,

Prakash


diff -Nurd vdr-1.3.6/config.h vdr-1.3.6.n/config.h
--- vdr-1.3.6/config.h 2004-03-05 15:35:15.000000000 +0100
+++ vdr-1.3.6.n/config.h 2004-04-25 11:48:37.644236824 +0200
@@ -138,7 +138,7 @@
bool Save(void)
{
bool result = true;
- T *l = (T *)First();
+ T *l = (T *)cList<T>::First();
cSafeFile f(fileName);
if (f.Open()) {
while (l) {
diff -Nurd vdr-1.3.6/plugin.c vdr-1.3.6.n/plugin.c
--- vdr-1.3.6/plugin.c 2003-08-30 16:52:58.000000000 +0200
+++ vdr-1.3.6.n/plugin.c 2004-04-25 12:18:51.134544392 +0200
@@ -161,10 +161,10 @@
handle = dlopen(fileName, RTLD_NOW);
const char *error = dlerror();
if (!error) {
- void *(*creator)(void);
- (void *)creator = dlsym(handle, "VDRPluginCreator");
+ void (*creator)(void);
+ *(void **)&creator = dlsym(handle, "VDRPluginCreator");
if (!(error = dlerror()))
- plugin = (cPlugin *)creator();
+ plugin = (cPlugin *)&creator;
}
if (!error) {
if (plugin && args) {

diff -Nurd vdr-1.3.6/config.h vdr-1.3.6.n/config.h
--- vdr-1.3.6/config.h	2004-03-05 15:35:15.000000000 +0100
+++ vdr-1.3.6.n/config.h	2004-04-25 11:48:37.644236824 +0200
@@ -138,7 +138,7 @@
   bool Save(void)
   {
     bool result = true;
-    T *l = (T *)First();
+    T *l = (T *)cList<T>::First();
     cSafeFile f(fileName);
     if (f.Open()) {
        while (l) {
diff -Nurd vdr-1.3.6/plugin.c vdr-1.3.6.n/plugin.c
--- vdr-1.3.6/plugin.c	2003-08-30 16:52:58.000000000 +0200
+++ vdr-1.3.6.n/plugin.c	2004-04-25 12:18:51.134544392 +0200
@@ -161,10 +161,10 @@
   handle = dlopen(fileName, RTLD_NOW);
   const char *error = dlerror();
   if (!error) {
-     void *(*creator)(void);
-     (void *)creator = dlsym(handle, "VDRPluginCreator");
+     void (*creator)(void);
+     *(void **)&creator = dlsym(handle, "VDRPluginCreator");
      if (!(error = dlerror()))
-        plugin = (cPlugin *)creator();
+        plugin = (cPlugin *)&creator;
      }
   if (!error) {
      if (plugin && args) {

Home | Main Index | Thread Index