--- ray/src/cv/mgf2meta.c 1995/05/04 14:25:15 2.5 +++ ray/src/cv/mgf2meta.c 2003/10/21 19:19:28 2.8 @@ -1,14 +1,13 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: mgf2meta.c,v 2.8 2003/10/21 19:19:28 schorsch Exp $"; #endif - /* * Convert MGF (Materials and Geometry Format) to Metafile 2-d graphics */ #include +#include +#include #include #include "random.h" #include "mgflib/parser.h" @@ -17,11 +16,7 @@ static char SCCSid[] = "$SunId$ LBL"; #define MX(v) (int)(MSIZE*(v)[(proj_axis+1)%3]) #define MY(v) (int)(MSIZE*(v)[(proj_axis+2)%3]) -#ifdef DCL_ATOF -extern double atof(); -#endif - -int r_face(); +int r_face(int ac, char **av); int proj_axis; double limit[3][2]; int layer; @@ -117,11 +112,7 @@ short hshtab[HTBLSIZ][4]; /* done line segments */ newlayer() /* start a new layer */ { -#ifdef BSD - bzero((char *)hshtab, sizeof(hshtab)); -#else - (void)memset((char *)hshtab, 0, sizeof(hshtab)); -#endif + (void)memset((char *)hshtab, '\0', sizeof(hshtab)); if (++layer >= 16) { mendpage(); layer = 0;