--- ray/src/meta/mgvars.c 2003/02/22 02:07:26 1.1 +++ ray/src/meta/mgvars.c 2003/10/27 10:28:59 1.3 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: mgvars.c,v 1.1 2003/02/22 02:07:26 greg Exp $"; +static const char RCSid[] = "$Id: mgvars.c,v 1.3 2003/10/27 10:28:59 schorsch Exp $"; #endif /* * mgvars.c - routines dealing with graph variables. @@ -10,13 +10,13 @@ static const char RCSid[] = "$Id: mgvars.c,v 1.1 2003/ */ #include - #include - #include - #include +#include "rtprocess.h" +#include "rtmisc.h" +#include "rtio.h" #include "mgvars.h" #define MAXLINE 512 @@ -25,8 +25,8 @@ static const char RCSid[] = "$Id: mgvars.c,v 1.1 2003/ #define isnum(c) (isdigit(c)||(c)=='-'||(c)=='+'||(c)=='.'||(c)=='e'||(c)=='E') -char *findfile(), *emalloc(), *ecalloc(), *erealloc(), *savestr(), *strcpy(); -FILE *fopen(), *popen(); +char *findfile(); + extern char *progname, *libpath[]; #ifdef DCL_ATOF @@ -330,7 +330,6 @@ char *string; } if (!*s) { loaddata(fname, fp, &vp->v.d); -#ifdef UNIX } else if (*s == '!') { if ((fp2 = popen(s+1, "r")) == NULL) { fprintf(stderr, "%s\n", string); @@ -341,7 +340,6 @@ char *string; } loaddata(s, fp2, &vp->v.d); pclose(fp2); -#endif } else { if ((fp2 = fopen(s, "r")) == NULL) { fprintf(stderr, "%s\n", string);