ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/rtio.h
(Generate patch)

Comparing ray/src/common/rtio.h (file contents):
Revision 3.7 by greg, Thu Feb 12 18:55:50 2004 UTC vs.
Revision 3.15 by greg, Tue Mar 20 18:45:04 2018 UTC

# Line 11 | Line 11
11   #include  <fcntl.h>
12   #include  <string.h>
13  
14 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
15 + #undef getc
16 + #undef getchar
17 + #undef putc
18 + #undef putchar
19 + #define getc    getc_unlocked
20 + #define getchar getchar_unlocked
21 + #define putc    putc_unlocked
22 + #define putchar putchar_unlocked
23 + #endif
24 +
25   #ifdef __cplusplus
26   extern "C" {
27   #endif
28                                          /* defined in badarg.c */
29   extern int      badarg(int ac, char **av, char *fl);
30                                          /* defined in expandarg.c */
31 + extern int      envexpchr, filexpchr;
32   extern int      expandarg(int *acp, char ***avp, int n);
33                                          /* defined in fdate.c */
34   extern time_t   fdate(char *fname);
# Line 24 | Line 36 | extern int     setfdate(char *fname, long ftim);
36                                          /* defined in fgetline.c */
37   extern char     *fgetline(char *s, int n, FILE *fp);
38                                          /* defined in fgetval.c */
39 < extern int      fgetval(FILE *fp, int ty, char *vp);
39 > extern int      fgetval(FILE *fp, int ty, void *vp);
40                                          /* defined in fgetword.c */
41   extern char     *fgetword(char *s, int n, FILE *fp);
42                                          /* defined in fputword.c */
# Line 34 | Line 46 | extern FILE    *frlibopen(char *fname);
46                                          /* defined in getlibpath.c */
47   extern char     *getrlibpath(void);
48                                          /* defined in gethomedir.c */
49 < extern char *gethomedir(char *uname, char *path, int plen);
49 > extern char     *gethomedir(char *uname, char *path, int plen);
50                                          /* defined in getpath.c */
51   extern char     *getpath(char *fname, char *searchpath, int mode);
52 +                                        /* defined in byteswap.c */
53 + extern void     swap16(char *wp, int n);
54 + extern void     swap32(char *wp, int n);
55 + extern void     swap64(char *wp, int n);
56                                          /* defined in portio.c */
57   extern void     putstr(char *s, FILE *fp);
58   extern void     putint(long i, int siz, FILE *fp);
59   extern void     putflt(double f, FILE *fp);
60 + extern int      putbinary(const void *s, int elsiz, int nel, FILE *fp);
61   extern char     *getstr(char *s, FILE *fp);
62   extern long     getint(int siz, FILE *fp);
63   extern double   getflt(FILE *fp);
64 + extern int      getbinary(void *s, int elsiz, int nel, FILE *fp);
65                                          /* defined in rexpr.c */
66   extern int      ecompile(char *sp, int iflg, int wflag);
67   extern char     *expsave(void);
# Line 57 | Line 75 | extern int     shash(char *s);
75   extern char     *savqstr(char *s);
76   extern void     freeqstr(char *s);
77                                          /* defined in wordfile.c */
78 < extern int      wordfile(char **words, char *fname);
79 < extern int      wordstring(char **avl, char *str);
78 > extern int      wordfile(char **words, int nargs, char *fname);
79 > extern int      wordstring(char **avl, int nargs, char *str);
80                                          /* defined in words.c */
81   extern char     *atos(char *rs, int nb, char *s);
82   extern char     *nextword(char *cp, int nb, char *s);

Diff Legend

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