summaryrefslogtreecommitdiffabout
path: root/recipes/vdr/files/cplusplus.patch
blob: 74e4731e7ed8018dc4157fd9e013a6d01e3d6653 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Index: vdr-1.7.10/tools.c
===================================================================
--- vdr-1.7.10.orig/tools.c	2010-01-03 16:34:41.162295450 +0100
+++ vdr-1.7.10/tools.c	2010-01-03 17:07:03.318358420 +0100
@@ -8,9 +8,12 @@
  */
 
 #include "tools.h"
-#include <ctype.h>
+#include <cctype>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstdarg>
+#include <ctime>
+
 extern "C" {
 #ifdef boolean
 #define HAVE_BOOLEAN
@@ -18,11 +21,10 @@
 #include <jpeglib.h>
 #undef boolean
 }
-#include <stdarg.h>
+
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/vfs.h>
-#include <time.h>
 #include <unistd.h>
 #include <utime.h>
 #include "i18n.h"
@@ -484,7 +486,7 @@
 {
   if (!FileName)
      return NULL;
-  char *TargetName = canonicalize_file_name(FileName);
+  char *TargetName = realpath(FileName,NULL);
   if (!TargetName) {
      if (errno == ENOENT) // file doesn't exist
         TargetName = strdup(FileName);
Index: vdr-1.7.10/tools.h
===================================================================
--- vdr-1.7.10.orig/tools.h	2010-01-03 16:30:20.441906815 +0100
+++ vdr-1.7.10/tools.h	2010-01-03 16:30:57.168575048 +0100
@@ -24,6 +24,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstdarg>
+
 typedef unsigned char uchar;
 
 extern int SysLogLevel;