From 49b4aab59a8db2ff4b5fc24d7884c80dbe4570dc Mon Sep 17 00:00:00 2001
From: Christophe Grenier <grenier@cgsecurity.org>
Date: Sun, 4 Jan 2009 19:43:44 +0100
Subject: [PATCH] Fix for C++ compilation

---
 src/diskcp.c   | 2 +-
 src/ewf.c      | 2 +-
 src/ext2_dir.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/diskcp.c b/src/diskcp.c
index fcae555f..4a0c2012 100644
--- a/src/diskcp.c
+++ b/src/diskcp.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
       printf("posix_memalign failed\n");
       return 1;
     }
-    buffer=res;
+    buffer=(char*)res;
   }
   if(1==2)
   {
diff --git a/src/ewf.c b/src/ewf.c
index a97af292..5f1317e3 100644
--- a/src/ewf.c
+++ b/src/ewf.c
@@ -249,7 +249,7 @@ static int fewf_nowrite(disk_t *disk_car,const unsigned int count, const void *n
 const char*td_ewf_version(void)
 {
 #ifdef LIBEWF_VERSION_STRING
-  return LIBEWF_VERSION_STRING;
+  return (const char*)LIBEWF_VERSION_STRING;
 #elif defined(LIBEWF_VERSION)
   return LIBEWF_VERSION;
 #else
diff --git a/src/ext2_dir.c b/src/ext2_dir.c
index e547ff07..f7d8d7dd 100644
--- a/src/ext2_dir.c
+++ b/src/ext2_dir.c
@@ -202,11 +202,11 @@ static int list_dir_proc2(ext2_ino_t dir,
 			 int	offset,
 			 int	blocksize,
 			 char	*buf,
-			 void	*private)
+			 void	*privateinfo)
 {
   struct ext2_inode	inode;
   ext2_ino_t		ino;
-  struct ext2_dir_struct *ls = (struct ext2_dir_struct *) private;
+  struct ext2_dir_struct *ls = (struct ext2_dir_struct *) privateinfo;
   file_data_t *new_file;
   if(entry==DIRENT_DELETED_FILE && (ls->dir_data->param & FLAG_LIST_DELETED)==0)
     return 0;