--- ray/src/util/rad.c	2003/07/03 22:41:45	2.68
+++ ray/src/util/rad.c	2003/07/14 20:02:30	2.69
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.68 2003/07/03 22:41:45 schorsch Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.69 2003/07/14 20:02:30 schorsch Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -8,12 +8,21 @@ static const char	RCSid[] = "$Id: rad.c,v 2.68 2003/07
 #include "standard.h"
 
 #include <ctype.h>
+#include <time.h>
 
 #include "platform.h"
 #include "view.h"
 #include "paths.h"
 #include "vars.h"
 
+#ifdef _WIN32
+  #define DELCMD "del"
+  #define RENAMECMD "rename"
+#else
+  #define DELCMD "rm -f"
+  #define RENAMECMD "mv"
+#endif
+
 				/* variables (alphabetical by name) */
 #define AMBFILE		0		/* ambient file name */
 #define DETAIL		1		/* level of scene detail */
@@ -80,7 +89,6 @@ char	overfile[] = NULL_DEVICE;
 char	overfile[] = "overture.unf";
 #endif
 
-extern time_t	time();
 
 time_t	scenedate;		/* date of latest scene or object file */
 time_t	octreedate;		/* date of octree */
@@ -1306,11 +1314,7 @@ rmfile(fn)			/* remove a file */
 char	*fn;
 {
 	if (!silent)
-#ifdef _WIN32
-		printf("\tdel %s\n", fn);
-#else
-		printf("\trm -f %s\n", fn);
-#endif
+		printf("\t%s %s\n", DELCMD, fn);
 	if (!nprocs)
 		return(0);
 	return(unlink(fn));
@@ -1321,11 +1325,7 @@ mvfile(fold, fnew)		/* move a file */
 char	*fold, *fnew;
 {
 	if (!silent)
-#ifdef _WIN32
-		printf("\trename %s %s\n", fold, fnew);
-#else
-		printf("\tmv %s %s\n", fold, fnew);
-#endif
+		printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
 	if (!nprocs)
 		return(0);
 	return(rename(fold, fnew));