[patch] patch for vdr to build with gcc-4.4

vdr-1.6.0-gcc44.patch (text/plain), 3.33 KB, created by hirakendu on 2009-05-29 07:28:04 UTC

diff -ruN vdr-1.6.0.orig/menu.c vdr-1.6.0/menu.c
--- vdr-1.6.0.orig/menu.c	2009-05-27 06:37:21.000000000 -0700
+++ vdr-1.6.0/menu.c	2009-05-27 14:13:22.000000000 -0700
@@ -2252,7 +2252,7 @@
   priority = recording->priority;
   lifetime = recording->lifetime;
 
-  char* p = strrchr(recording->Name(), '~');
+  char *p = (char *) strrchr(recording->Name(), '~');
   if (p) {
      p++;
      Utf8Strn0Cpy(name, p, sizeof(name));
diff -ruN vdr-1.6.0.orig/recording.c vdr-1.6.0/recording.c
--- vdr-1.6.0.orig/recording.c	2009-05-27 06:37:21.000000000 -0700
+++ vdr-1.6.0/recording.c	2009-05-27 14:14:58.000000000 -0700
@@ -530,8 +530,8 @@
      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
      Subtitle = SubtitleBuffer;
      }
-  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+  char *macroTITLE   = (char *) strstr(Timer->File(), TIMERMACRO_TITLE);
+  char *macroEPISODE = (char *) strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
@@ -580,7 +580,7 @@
       }
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
-  char *p = strrchr(FileName, '/');
+  char *p = (char *) strrchr(FileName, '/');
 
   name = NULL;
   dvdname = NULL;
@@ -1528,7 +1528,7 @@
   if (recording) {
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      Del(recording, false);
-     char *ext = strrchr(recording->FileName(), '.');
+     char *ext = (char *) strrchr(recording->FileName(), '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         recording->fileSizeMB = DirSizeMB(recording->FileName());
diff -ruN vdr-1.6.0.orig/svdrp.c vdr-1.6.0/svdrp.c
--- vdr-1.6.0.orig/svdrp.c	2009-05-27 06:37:21.000000000 -0700
+++ vdr-1.6.0/svdrp.c	2009-05-27 14:16:29.000000000 -0700
@@ -738,7 +738,7 @@
      char *strtok_next;
      FileName = strtok_r(p, delim, &strtok_next);
      // image type:
-     char *Extension = strrchr(FileName, '.');
+     char *Extension = (char *) strrchr(FileName, '.');
      if (Extension) {
         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
            Jpeg = true;
@@ -798,12 +798,12 @@
      if (FileName) {
         if (grabImageDir) {
            cString s;
-           char *slash = strrchr(FileName, '/');
+           char *slash = (char *) strrchr(FileName, '/');
            if (!slash) {
               s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
-           slash = strrchr(FileName, '/'); // there definitely is one
+           slash = (char *) strrchr(FileName, '/'); // there definitely is one
            *slash = 0;
            char *r = realpath(FileName, RealFileName);
            *slash = '/';
diff -ruN vdr-1.6.0.orig/videodir.c vdr-1.6.0/videodir.c
--- vdr-1.6.0.orig/videodir.c	2009-05-27 06:37:21.000000000 -0700
+++ vdr-1.6.0/videodir.c	2009-05-27 14:17:34.000000000 -0700
@@ -183,7 +183,7 @@
 {
   cString Name(FileName);
   char *p;
-  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
+  while ((p = (char *) strrchr((const char*)Name + 1, '/')) != NULL) {
         *p = 0; // truncate at last '/'
         if (stat(Name, Stat) == 0) {
            isyslog("StatNearestDir: Stating %s", (const char*)Name);