--- ray/src/hd/rhdisp2.c 1999/03/04 10:29:22 3.32 +++ ray/src/hd/rhdisp2.c 2003/04/23 00:52:33 3.34 @@ -1,9 +1,6 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdisp2.c,v 3.34 2003/04/23 00:52:33 greg Exp $"; #endif - /* * Holodeck beam tracking for display process */ @@ -37,7 +34,7 @@ newcbeam() /* allocate new entry at end of cbeam arra cbeam = (PACKHEAD *)malloc( maxcbeam*sizeof(PACKHEAD) ); else - cbeam = (PACKHEAD *)realloc( (char *)cbeam, + cbeam = (PACKHEAD *)realloc((void *)cbeam, maxcbeam*sizeof(PACKHEAD) ); if (cbeam == NULL) error(SYSTEM, "out of memory in newcbeam"); @@ -174,7 +171,7 @@ int hr, vr; if (blist.bl[i].nr > cbeam[n].nr) cbeam[n].nr = blist.bl[i].nr; } - free((char *)blist.bl); /* free list */ + free((void *)blist.bl); /* free list */ if (MEYERNG <= FTINY) return(slist); /* compute average eye range */