--- ray/src/rt/rpict.c 2003/06/26 00:58:10 2.56 +++ ray/src/rt/rpict.c 2003/07/03 21:44:41 2.60 @@ -7,11 +7,12 @@ static const char RCSid[] = "$Id"; #include "copyright.h" +#include "platform.h" #include "ray.h" #include -#ifndef NIX +#ifndef NON_POSIX #ifdef BSD #include #include @@ -24,7 +25,6 @@ static const char RCSid[] = "$Id"; #include #include -#include "platform.h" #include "view.h" #include "random.h" #include "paths.h" @@ -115,9 +115,7 @@ void report(); double pixvalue(); -#ifdef NIX -#define file_exists(f) (access(f,F_OK)==0) -#else +#ifdef RHAS_STAT #include #include int @@ -128,6 +126,8 @@ char *fname; if (stat(fname, &sbuf) < 0) return(0); return((sbuf.st_mode & S_IFREG) != 0); } +#else +#define file_exists(f) (access(f,F_OK)==0) #endif @@ -137,7 +137,7 @@ int code; { if (code) /* report status */ report(); -#ifndef NIX +#ifndef NON_POSIX headclean(); /* delete header file */ pfclean(); /* clean up persist files */ #endif @@ -145,7 +145,7 @@ int code; } -#ifndef NIX +#ifndef NON_POSIX void report() /* report progress */ { @@ -322,6 +322,7 @@ char *pout, *zout, *prvr; putchar('\n'); if (pa < .99 || pa > 1.01) fputaspect(pa, stdout); + fputnow(stdout); fputformat(COLRFMT, stdout); putchar('\n'); if (zout != NULL)