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

Comparing ray/src/common/rtio.h (file contents):
Revision 3.12 by greg, Mon Mar 21 19:06:08 2016 UTC vs.
Revision 3.17 by greg, Fri May 4 21:22:44 2018 UTC

# Line 13 | Line 13
13  
14   #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
15   #undef getc
16 + #undef getchar
17   #undef putc
18 + #undef putchar
19 + #undef feof
20 + #undef ferror
21   #define getc    getc_unlocked
22 + #define getchar getchar_unlocked
23   #define putc    putc_unlocked
24 + #define putchar putchar_unlocked
25 + #define feof    feof_unlocked
26 + #define ferror  ferror_unlocked
27   #endif
28  
29   #ifdef __cplusplus
# Line 24 | Line 32 | extern "C" {
32                                          /* defined in badarg.c */
33   extern int      badarg(int ac, char **av, char *fl);
34                                          /* defined in expandarg.c */
35 + extern int      envexpchr, filexpchr;
36   extern int      expandarg(int *acp, char ***avp, int n);
37                                          /* defined in fdate.c */
38   extern time_t   fdate(char *fname);
# Line 52 | Line 61 | extern void    swap64(char *wp, int n);
61   extern void     putstr(char *s, FILE *fp);
62   extern void     putint(long i, int siz, FILE *fp);
63   extern void     putflt(double f, FILE *fp);
64 < extern int      putbinary(char *s, int elsiz, int nel, FILE *fp);
64 > extern int      putbinary(const void *s, int elsiz, int nel, FILE *fp);
65   extern char     *getstr(char *s, FILE *fp);
66   extern long     getint(int siz, FILE *fp);
67   extern double   getflt(FILE *fp);
68 < extern int      getbinary(char *s, int elsiz, int nel, FILE *fp);
68 > extern int      getbinary(void *s, int elsiz, int nel, FILE *fp);
69                                          /* defined in rexpr.c */
70   extern int      ecompile(char *sp, int iflg, int wflag);
71   extern char     *expsave(void);
# Line 87 | Line 96 | extern int     isfltd(char *s, char *ds);
96   extern float *  matchlamp(char *s);
97   extern int      loadlamps(char *file);
98   extern void     freelamps(void);
99 +                                        /* defined in option strlcpy.c */
100 + extern size_t   strlcpy(char *dst, const char *src, size_t siz);
101 + extern size_t   strlcat(char *dst, const char *src, size_t siz);
102  
103   #ifdef __cplusplus
104   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)