wok-next annotate partimage/stuff/partimage-0.6.7_gcc4.u @ rev 4229
partimage*, fix build with gcc 4.x
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Thu Sep 24 12:41:52 2009 +0000 (2009-09-24) |
parents | |
children | 1d167f3154a8 |
rev | line source |
---|---|
erjo@4229 | 1 --- partimage-0.6.7-ori/src/client/main.cpp Sun Feb 3 21:58:00 2008 |
erjo@4229 | 2 +++ partimage-0.6.7/src/client/main.cpp Thu Sep 24 12:03:23 2009 |
erjo@4229 | 3 @@ -26,9 +26,11 @@ |
erjo@4229 | 4 #include <sys/param.h> |
erjo@4229 | 5 #endif |
erjo@4229 | 6 |
erjo@4229 | 7 + |
erjo@4229 | 8 #include <stdlib.h> |
erjo@4229 | 9 #include <stdio.h> |
erjo@4229 | 10 #include <unistd.h> |
erjo@4229 | 11 +#include <cstdlib> |
erjo@4229 | 12 |
erjo@4229 | 13 #define __STDC_FORMAT_MACROS |
erjo@4229 | 14 #include <inttypes.h> |
erjo@4229 | 15 --- partimage-0.6.7-ori/src/server/partimaged-main.cpp Sun Feb 3 21:57:53 2008 |
erjo@4229 | 16 +++ partimage-0.6.7/src/server/partimaged-main.cpp Thu Sep 24 10:31:42 2009 |
erjo@4229 | 17 @@ -27,7 +27,7 @@ |
erjo@4229 | 18 |
erjo@4229 | 19 #include <stdio.h> |
erjo@4229 | 20 #include <stdlib.h> |
erjo@4229 | 21 -#include <iostream.h> |
erjo@4229 | 22 +#include <iostream> |
erjo@4229 | 23 #include <sys/types.h> |
erjo@4229 | 24 #include <sys/stat.h> |
erjo@4229 | 25 #include <signal.h> |
erjo@4229 | 26 --- partimage-0.6.7-ori/src/server/partimaged.cpp Sun Feb 3 21:57:53 2008 |
erjo@4229 | 27 +++ partimage-0.6.7/src/server/partimaged.cpp Thu Sep 24 10:32:08 2009 |
erjo@4229 | 28 @@ -22,7 +22,7 @@ |
erjo@4229 | 29 |
erjo@4229 | 30 #include <stdio.h> |
erjo@4229 | 31 #include <stdlib.h> |
erjo@4229 | 32 -#include <iostream.h> |
erjo@4229 | 33 +#include <iostream> |
erjo@4229 | 34 |
erjo@4229 | 35 #include "net.h" |
erjo@4229 | 36 #include "netserver.h" |
erjo@4229 | 37 --- partimage-0.6.7-ori/src/shared/net.h Sun Feb 3 21:57:55 2008 |
erjo@4229 | 38 +++ partimage-0.6.7/src/shared/net.h Thu Sep 24 10:32:35 2009 |
erjo@4229 | 39 @@ -28,7 +28,7 @@ |
erjo@4229 | 40 #include <sys/types.h> |
erjo@4229 | 41 #include <sys/socket.h> |
erjo@4229 | 42 #include <arpa/inet.h> |
erjo@4229 | 43 -#include <iostream.h> |
erjo@4229 | 44 +#include <iostream> |
erjo@4229 | 45 #include <pthread.h> |
erjo@4229 | 46 |
erjo@4229 | 47 #include "pathnames.h" |