summaryrefslogtreecommitdiffstats
path: root/extra/ede/ede-2.0-beta.c++.patch
blob: a4762cd1ececc892e03fbfbfa3def5de0eef3698 (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
--- ede-2.0-beta.orig/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/stdargx.h	2009-10-08 10:44:45.000000000 -0300
+++ ede-2.0-beta/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/stdargx.h	2009-10-10 12:23:27.000000000 -0300
@@ -60,7 +60,7 @@
     */
     memcpy(&argsxP->v, args, sizeof(argsxP->v));
 #else
-    argsxP->v = args;
+    va_copy(argsxP->v, args);
 #endif
 }
 
--- ede-2.0-beta.orig/ede-autostart/ede-autostart.cpp	2009-10-08 10:44:55.000000000 -0300
+++ ede-2.0-beta/ede-autostart/ede-autostart.cpp	2009-10-11 09:37:21.000000000 -0300
@@ -87,8 +87,8 @@
 static Fl_Check_Browser* cbrowser;
 static Fl_Pixmap         warnpix((const char**)warning_xpm);
 
-static char* get_basename(const char* path) {
-	char* p = strrchr(path, '/');
+static const char* get_basename(const char* path) {
+	const char* p = strrchr(path, '/');
 	if(p) 
 		return (p + 1);
 
--- ede-2.0-beta.orig/ede-desktop/Utils.cpp	2009-10-08 10:44:06.000000000 -0300
+++ ede-2.0-beta/ede-desktop/Utils.cpp	2009-10-11 09:48:07.000000000 -0300
@@ -305,11 +305,11 @@
 }
 
 char* get_basename(const char* path) {
-	char* p = strrchr(path, '/');
+	const char* p = strrchr(path, '/');
 	if(p)
-		return (p + 1);
+		return const_cast<char*>(p + 1);
 
-	return (char*)path;
+	return const_cast<char*>(path);
 }
 
 bool is_temp_filename(const char* path) {
--- ede-2.0-beta.orig/ede-launch/ede-launch.cpp	2009-10-08 10:44:09.000000000 -0300
+++ ede-2.0-beta/ede-launch/ede-launch.cpp	2009-10-11 09:53:11.000000000 -0300
@@ -67,7 +67,7 @@
 }
 
 static char* get_basename(const char* path) {
-	char *p = strrchr(path, '/');
+	char *p = const_cast<char*>(strrchr(path, '/'));
 	if(p)
 		return (p + 1);