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

Comparing ray/src/hd/rhdisp.c (file contents):
Revision 3.42 by gwlarson, Thu Jul 29 15:38:40 1999 UTC vs.
Revision 3.45 by greg, Tue May 13 17:58:33 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1999 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Holodeck display process.
6   */
# Line 22 | Line 19 | static char SCCSid[] = "$SunId$ SGI";
19   #define FSIZDEF         0.125   /* default focus frame size */
20   #endif
21  
22 < #ifdef linux
22 > #if defined(freebsd)
23 > #define fbufcnt(f)      ((f)->_r)
24 > #elif defined(__GNUC__)
25   #define fbufcnt(f)      ((f)->_IO_read_end - (f)->_IO_read_ptr)
26   #else
27   #define fbufcnt(f)      ((f)->_cnt)
# Line 61 | Line 60 | main(argc, argv)
60   int     argc;
61   char    *argv[];
62   {
64 –        extern int      eputs();
63          int     rdy, inp, res = 0, pause = 0;
64  
65          progname = argv[0];
# Line 218 | Line 216 | char   *gfn, *pfn;
216          hdlist[hd] = (HOLO *)malloc(sizeof(HOLO));
217          if (hdlist[hd] == NULL)
218                  error(SYSTEM, "out of memory in add_holo");
219 <        bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID));
219 >        bcopy((void *)hdg, (void *)hdlist[hd], sizeof(HDGRID));
220          hdcompgrid(hdlist[hd]);
221          hdgfn[hd] = savestr(gfn);
222          hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL;
# Line 481 | Line 479 | serv_result()                  /* get next server result and process
479                          if (buf == NULL)
480                                  buf = (char *)malloc(bufsiz=msg.nbytes);
481                          else
482 <                                buf = (char *)realloc(buf, bufsiz=msg.nbytes);
482 >                                buf = (char *)realloc((void *)buf,
483 >                                                bufsiz=msg.nbytes);
484                          if (buf == NULL)
485                                  error(SYSTEM, "out of memory in serv_result");
486                  }
# Line 568 | Line 567 | char   *p;
567   }
568  
569  
570 + void
571   eputs(s)                        /* put error message to stderr */
572   register char  *s;
573   {
# Line 587 | Line 587 | register char  *s;
587   }
588  
589  
590 + void
591   quit(code)                      /* clean up and exit */
592   int     code;
593   {

Diff Legend

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