File magicpoint-ia64.diff of Package mgp

---
 ctlwords.c          |    1 +
 image/cmuwmraster.c |    2 +-
 image/image.h       |    1 +
 mgp.c               |    2 +-
 print.c             |    4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)

--- a/ctlwords.c
+++ b/ctlwords.c
@@ -23,6 +23,7 @@ BEGIN {
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 main(int argc, char *argv[])
--- a/image/cmuwmraster.c
+++ b/image/cmuwmraster.c
@@ -108,7 +108,7 @@ unsigned int verbose;
       {
 	  fprintf(stderr,"CMU WM raster %s is of depth %d, must be 1",
 		  name,
-		  (int) header.depth);
+		  (int) memToVal(header.depth, sizeof(short)));
 	  return(NULL);
       }
 
--- a/image/image.h
+++ b/image/image.h
@@ -10,6 +10,7 @@
 
 #include "copyright.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 #if defined(SYSV) || defined(VMS) || 1
 #include <string.h>
--- a/mgp.c
+++ b/mgp.c
@@ -506,7 +506,7 @@ genhtml(start_page)
 	char *childdebug;
 	char *convdb[][3] = {{ "jpg", "cjpeg", "djpeg" },
 				{ "png", "pnmtopng", "pngtopnm" },
-				{ NULL, NULL, NULL }};
+				{ { 0 }, { 0 }, { 0 } }};
 	int inum = 0;
 
 	/* check image type */
--- a/print.c
+++ b/print.c
@@ -1297,7 +1297,7 @@ icon_output(tp)
 
 	paintit = (painticon || colorps);
 
-	switch ((int)tp->font) {	/*XXX*/
+	switch ((long int)tp->font) {	/*XXX*/
 	case 0:
 		/* XXX: image is not supported yet */
 		break;
@@ -1658,7 +1658,7 @@ icon_remember(icon, fontsize, offset, co
 	textpool[ntextpool].xoffset = offset;
 	textpool[ntextpool].xsiz = char_size[0];
 	textpool[ntextpool].size = fontsize;
-	textpool[ntextpool].font = (struct fontmap *)icon;	/*XXX*/
+	textpool[ntextpool].font = (struct fontmap *)(long int )icon;	/*XXX*/
 	textpool[ntextpool].text = NULL;
 	textpool[ntextpool].fore = color;
 	textpool[ntextpool].back = back;	/*XXX*/