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.10 by greg, Thu Mar 3 22:06:18 2016 UTC vs.
Revision 3.13 by greg, Thu Aug 18 00:52:48 2016 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 putc
17 + #define getc    getc_unlocked
18 + #define putc    putc_unlocked
19 + #endif
20 +
21   #ifdef __cplusplus
22   extern "C" {
23   #endif
# Line 45 | Line 52 | extern void    swap64(char *wp, int n);
52   extern void     putstr(char *s, FILE *fp);
53   extern void     putint(long i, int siz, FILE *fp);
54   extern void     putflt(double f, FILE *fp);
55 < extern int      putbinary(char *s, int elsiz, int nel, FILE *fp);
55 > extern int      putbinary(const void *s, int elsiz, int nel, FILE *fp);
56   extern char     *getstr(char *s, FILE *fp);
57   extern long     getint(int siz, FILE *fp);
58   extern double   getflt(FILE *fp);
59 < extern int      getbinary(char *s, int elsiz, int nel, FILE *fp);
59 > extern int      getbinary(void *s, int elsiz, int nel, FILE *fp);
60                                          /* defined in rexpr.c */
61   extern int      ecompile(char *sp, int iflg, int wflag);
62   extern char     *expsave(void);
# Line 63 | Line 70 | extern int     shash(char *s);
70   extern char     *savqstr(char *s);
71   extern void     freeqstr(char *s);
72                                          /* defined in wordfile.c */
73 < extern int      wordfile(char **words, char *fname);
74 < extern int      wordstring(char **avl, char *str);
73 > extern int      wordfile(char **words, int nargs, char *fname);
74 > extern int      wordstring(char **avl, int nargs, char *str);
75                                          /* defined in words.c */
76   extern char     *atos(char *rs, int nb, char *s);
77   extern char     *nextword(char *cp, int nb, char *s);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines