--- ray/src/rt/rview.c 2003/02/25 02:47:23 2.19 +++ ray/src/rt/rview.c 2003/07/21 22:30:19 2.23 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rview.c,v 2.19 2003/02/25 02:47:23 greg Exp $"; +static const char RCSid[] = "$Id: rview.c,v 2.23 2003/07/21 22:30:19 schorsch Exp $"; #endif /* * rview.c - routines and variables for interactive view generation. @@ -9,14 +9,13 @@ static const char RCSid[] = "$Id: rview.c,v 2.19 2003/ #include "copyright.h" -#include "ray.h" +#include +#include +#include "ray.h" #include "rpaint.h" -#include -#include - CUBE thescene; /* our scene */ OBJECT nsceneobjs; /* number of objects in our scene */ @@ -115,19 +114,18 @@ char *dname; id = octname!=NULL ? octname : progname; /* check device table */ for (i = 0; devtable[i].name; i++) - if (!strcmp(dname, devtable[i].name)) + if (!strcmp(dname, devtable[i].name)) { if ((dev = (*devtable[i].init)(dname, id)) == NULL) { sprintf(errmsg, "cannot initialize %s", dname); error(USER, errmsg); } else return; -#ifndef NIX + } /* not there, try exec */ if ((dev = comm_init(dname, id)) == NULL) { sprintf(errmsg, "cannot start device \"%s\"", dname); error(USER, errmsg); } -#endif }