# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1253891995 0
# Node ID 1d167f3154a872c56e29ccae1c7652ea5f88c926
# Parent  c390c1a5e0820fd77c6af4d431f94664d084ccb6
partimage: fix build with gcc 4.x (again)

diff -r c390c1a5e082 -r 1d167f3154a8 partimage/stuff/partimage-0.6.7_gcc4.u
--- a/partimage/stuff/partimage-0.6.7_gcc4.u	Fri Sep 25 17:12:16 2009 +0200
+++ b/partimage/stuff/partimage-0.6.7_gcc4.u	Fri Sep 25 15:19:55 2009 +0000
@@ -12,6 +12,25 @@
  
  #define __STDC_FORMAT_MACROS
  #include <inttypes.h>
+--- partimage-0.6.7-ori/src/client/misc.cpp	Sun Feb  3 21:58:00 2008
++++ partimage-0.6.7/src/client/misc.cpp	Fri Sep 25 15:14:39 2009
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ #define __STDC_FORMAT_MACROS
+ #include <inttypes.h>
++#include <cstring>
+ 
+ #ifdef HAVE_SYS_PARAM_H
+   #include <sys/param.h>
+@@ -2372,7 +2373,7 @@
+ 
+ static char *sfdisk_line_to_partition_device(const char *line)
+ {
+-  if (char *p = strchr(line, ':')) {
++  if (const char *p = strchr(line, ':')) {
+     while (p[-1] == ' ' && p > line) p--;
+     return strndup(line, p - line);
+   } else {
 --- partimage-0.6.7-ori/src/server/partimaged-main.cpp	Sun Feb  3 21:57:53 2008
 +++ partimage-0.6.7/src/server/partimaged-main.cpp	Thu Sep 24 10:31:42 2009
 @@ -27,7 +27,7 @@