--- ray/src/common/rtio.h	2006/12/23 17:27:45	3.9
+++ ray/src/common/rtio.h	2018/05/30 14:14:56	3.18
@@ -1,4 +1,4 @@
-/* RCSid $Id: rtio.h,v 3.9 2006/12/23 17:27:45 greg Exp $ */
+/* RCSid $Id: rtio.h,v 3.18 2018/05/30 14:14:56 greg Exp $ */
 /*
  *	Radiance i/o and string routines
  */
@@ -11,12 +11,28 @@
 #include  <fcntl.h>
 #include  <string.h>
 
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef getchar
+#undef putc
+#undef putchar
+#undef feof
+#undef ferror
+#define getc    getc_unlocked
+#define getchar	getchar_unlocked
+#define putc    putc_unlocked
+#define putchar	putchar_unlocked
+#define feof	feof_unlocked
+#define ferror	ferror_unlocked
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 					/* defined in badarg.c */
 extern int	badarg(int ac, char **av, char *fl);
 					/* defined in expandarg.c */
+extern int	envexpchr, filexpchr;
 extern int	expandarg(int *acp, char ***avp, int n);
 					/* defined in fdate.c */
 extern time_t	fdate(char *fname);
@@ -34,7 +50,7 @@ extern FILE	*frlibopen(char *fname);
 					/* defined in getlibpath.c */
 extern char	*getrlibpath(void);
 					/* defined in gethomedir.c */
-extern char *gethomedir(char *uname, char *path, int plen);
+extern char	*gethomedir(char *uname, char *path, int plen);
 					/* defined in getpath.c */
 extern char	*getpath(char *fname, char *searchpath, int mode);
 					/* defined in byteswap.c */
@@ -45,9 +61,11 @@ extern void	swap64(char *wp, int n);
 extern void	putstr(char *s, FILE *fp);
 extern void	putint(long i, int siz, FILE *fp);
 extern void	putflt(double f, FILE *fp);
+extern int	putbinary(const void *s, int elsiz, int nel, FILE *fp);
 extern char	*getstr(char *s, FILE *fp);
 extern long	getint(int siz, FILE *fp);
 extern double	getflt(FILE *fp);
+extern int	getbinary(void *s, int elsiz, int nel, FILE *fp);
 					/* defined in rexpr.c */
 extern int	ecompile(char *sp, int iflg, int wflag);
 extern char	*expsave(void);
@@ -61,8 +79,8 @@ extern int	shash(char *s);
 extern char	*savqstr(char *s);
 extern void	freeqstr(char *s);
 					/* defined in wordfile.c */
-extern int	wordfile(char **words, char *fname);
-extern int	wordstring(char **avl, char *str);
+extern int	wordfile(char **words, int nargs, char *fname);
+extern int	wordstring(char **avl, int nargs, char *str);
 					/* defined in words.c */
 extern char	*atos(char *rs, int nb, char *s);
 extern char	*nextword(char *cp, int nb, char *s);
@@ -78,6 +96,11 @@ extern int	isfltd(char *s, char *ds);
 extern float *	matchlamp(char *s);
 extern int	loadlamps(char *file);
 extern void	freelamps(void);
+
+#ifdef __GNUC__			/* defined in option strlcpy.c */
+extern size_t	strlcpy(char *dst, const char *src, size_t siz);
+extern size_t	strlcat(char *dst, const char *src, size_t siz);
+#endif
 
 #ifdef __cplusplus
 }