wok-next view partimage/stuff/partimage-0.6.7_gcc4.u @ rev 12753
dosbox: fix compile_rules
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri May 11 13:42:55 2012 +0200 (2012-05-11) |
| parents | ab3be1ac9c50 |
| children |
line source
1 --- partimage-0.6.7-ori/src/client/main.cpp Sun Feb 3 21:58:00 2008
2 +++ partimage-0.6.7/src/client/main.cpp Thu Sep 24 12:03:23 2009
3 @@ -26,9 +26,11 @@
4 #include <sys/param.h>
5 #endif
7 +
8 #include <stdlib.h>
9 #include <stdio.h>
10 #include <unistd.h>
11 +#include <cstdlib>
13 #define __STDC_FORMAT_MACROS
14 #include <inttypes.h>
15 --- partimage-0.6.7-ori/src/client/misc.cpp Sun Feb 3 21:58:00 2008
16 +++ partimage-0.6.7/src/client/misc.cpp Fri Sep 25 15:14:39 2009
17 @@ -24,6 +24,7 @@
18 #include <unistd.h>
19 #define __STDC_FORMAT_MACROS
20 #include <inttypes.h>
21 +#include <cstring>
23 #ifdef HAVE_SYS_PARAM_H
24 #include <sys/param.h>
25 @@ -2372,7 +2373,7 @@
27 static char *sfdisk_line_to_partition_device(const char *line)
28 {
29 - if (char *p = strchr(line, ':')) {
30 + if (const char *p = strchr(line, ':')) {
31 while (p[-1] == ' ' && p > line) p--;
32 return strndup(line, p - line);
33 } else {
34 --- partimage-0.6.7-ori/src/server/partimaged-main.cpp Sun Feb 3 21:57:53 2008
35 +++ partimage-0.6.7/src/server/partimaged-main.cpp Thu Sep 24 10:31:42 2009
36 @@ -27,7 +27,7 @@
38 #include <stdio.h>
39 #include <stdlib.h>
40 -#include <iostream.h>
41 +#include <iostream>
42 #include <sys/types.h>
43 #include <sys/stat.h>
44 #include <signal.h>
45 --- partimage-0.6.7-ori/src/server/partimaged.cpp Sun Feb 3 21:57:53 2008
46 +++ partimage-0.6.7/src/server/partimaged.cpp Thu Sep 24 10:32:08 2009
47 @@ -22,7 +22,7 @@
49 #include <stdio.h>
50 #include <stdlib.h>
51 -#include <iostream.h>
52 +#include <iostream>
54 #include "net.h"
55 #include "netserver.h"
56 --- partimage-0.6.7-ori/src/shared/net.h Sun Feb 3 21:57:55 2008
57 +++ partimage-0.6.7/src/shared/net.h Thu Sep 24 10:32:35 2009
58 @@ -28,7 +28,7 @@
59 #include <sys/types.h>
60 #include <sys/socket.h>
61 #include <arpa/inet.h>
62 -#include <iostream.h>
63 +#include <iostream>
64 #include <pthread.h>
66 #include "pathnames.h"