Mercurial > hg > minc-tools

changeset 2095:f314d9784d74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate use of caddr_t to avoid problems building for Windows
author bert <bert>
date Wed, 04 May 2005 20:14:10 +0000
parents 67a942f14957
children a660427dfe39
files conversion/minctoecat/ecat_write.c conversion/minctoecat/ecat_write.h conversion/minctoecat/minctoecat.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/conversion/minctoecat/ecat_write.c
+++ b/conversion/minctoecat/ecat_write.c
@@ -349,7 +349,7 @@
   imagesub = (Image_subheader *) data->shptr ;
   if (imagesub == NULL) {
     imagesub = (Image_subheader *) calloc(1, MatBLKSIZE);
-    data->shptr = (caddr_t)imagesub;
+    data->shptr = imagesub;
   }                                                     /* use MatrixData info */
   imagesub->x_pixel_size = data->pixel_size;
   imagesub->y_pixel_size = data->y_size;
--- a/conversion/minctoecat/ecat_write.h
+++ b/conversion/minctoecat/ecat_write.h
@@ -204,8 +204,8 @@
   MatrixFile	*matfile ;	/* pointer to parent */
   DataSetType	mat_type ;	/* type of matrix? */
   MatrixDataType	data_type ;	/* type of data */
-  caddr_t		shptr ;		/* pointer to sub-header */
-  caddr_t		data_ptr ;	/* pointer to data */
+  void *	shptr ;		/* pointer to sub-header */
+  void *	data_ptr ;	/* pointer to data */
   int		data_size ;	/* size of data in bytes */
   int		xdim;		/* dimensions of data */
   int		ydim;		/* y dimension */
--- a/conversion/minctoecat/minctoecat.c
+++ b/conversion/minctoecat/minctoecat.c
@@ -976,8 +976,8 @@
   md.matfile = mf;
   md.mat_type = mf->mhptr->file_type;
   md.data_type = sh->data_type;
-  md.shptr = (caddr_t)sh;
-  md.data_ptr = (caddr_t)ptr;
+  md.shptr = sh;
+  md.data_ptr = ptr;
   md.xdim = sh->x_dimension;
   md.ydim = sh->y_dimension;
   md.zdim = sh->z_dimension;