ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rad.c
(Generate patch)

Comparing ray/src/util/rad.c (file contents):
Revision 2.34 by greg, Thu Nov 18 13:28:30 1993 UTC vs.
Revision 2.35 by greg, Tue Nov 23 09:26:38 1993 UTC

# Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   #include "standard.h"
12   #include "paths.h"
13   #include <ctype.h>
14 + #include <sys/types.h>
15  
16  
17   typedef struct {
# Line 101 | Line 102 | char   overfile[] = "overture.raw";
102   char    overfile[] = "/dev/null";
103   #endif
104  
105 < extern unsigned long    fdate(), time();
105 > extern time_t   fdate(), time();
106  
107 < unsigned long   scenedate;      /* date of latest scene or object file */
108 < unsigned long   octreedate;     /* date of octree */
109 < unsigned long   matdate;        /* date of latest material file */
110 < unsigned long   illumdate;      /* date of last illum file */
107 > time_t  scenedate;              /* date of latest scene or object file */
108 > time_t  octreedate;             /* date of octree */
109 > time_t  matdate;                /* date of latest material file */
110 > time_t  illumdate;              /* date of last illum file */
111  
112   char    *oct0name;              /* name of pre-mkillum octree */
113 < unsigned long   oct0date;       /* date of pre-mkillum octree */
113 > time_t  oct0date;               /* date of pre-mkillum octree */
114   char    *oct1name;              /* name of post-mkillum octree */
115 < unsigned long   oct1date;       /* date of post-mkillum octree (>= matdate) */
115 > time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
116  
117   int     explicate = 0;          /* explicate variables */
118   int     silent = 0;             /* do work silently */
# Line 459 | Line 460 | register VARIABLE      *vp;
460   }
461  
462  
463 < unsigned long
463 > time_t
464   checklast(fnames)                       /* check files and find most recent */
465   register char   *fnames;
466   {
467          char    thisfile[MAXPATH];
468 <        unsigned long   thisdate, lastdate = 0;
468 >        time_t  thisdate, lastdate = 0;
469          register char   *cp;
470  
471          if (fnames == NULL)
# Line 512 | Line 513 | int    pred;
513  
514   checkfiles()                    /* check for existence and modified times */
515   {
516 <        unsigned long   objdate;
516 >        time_t  objdate;
517  
518          if (!vdef(OCTREE)) {
519                  if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
# Line 671 | Line 672 | oconv()                                /* run oconv and mkillum if necessary */
672                          unlink(vval(OCTREE));
673                          exit(1);
674                  }
675 <                octreedate = time((unsigned long *)NULL);
675 >                octreedate = time((time_t *)NULL);
676          }
677          if (oct1name == vval(OCTREE))           /* no mkillum? */
678                  oct1date = octreedate > matdate ? octreedate : matdate;
# Line 697 | Line 698 | oconv()                                /* run oconv and mkillum if necessary */
698                          unlink(oct0name);
699                          exit(1);
700                  }
701 <                oct0date = time((unsigned long *)NULL);
701 >                oct0date = time((time_t *)NULL);
702          }
703          mkillumopts(mkopts);                    /* build mkillum command */
704          mktemp(illumtmp);
# Line 725 | Line 726 | oconv()                                /* run oconv and mkillum if necessary */
726                  unlink(oct1name);
727                  exit(1);
728          }
729 <        oct1date = time((unsigned long *)NULL);
729 >        oct1date = time((time_t *)NULL);
730          rmfile(illumtmp);
731   }
732  
# Line 765 | Line 766 | register char  *mo;
766  
767   checkambfile()                  /* check date on ambient file */
768   {
769 <        unsigned long   afdate;
769 >        time_t  afdate;
770  
771          if (!vdef(AMBFILE))
772                  return;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines