--- ray/src/common/rtio.h	2016/03/03 22:06:18	3.10
+++ ray/src/common/rtio.h	2016/03/21 19:06:08	3.12
@@ -1,4 +1,4 @@
-/* RCSid $Id: rtio.h,v 3.10 2016/03/03 22:06:18 greg Exp $ */
+/* RCSid $Id: rtio.h,v 3.12 2016/03/21 19:06:08 greg Exp $ */
 /*
  *	Radiance i/o and string routines
  */
@@ -11,6 +11,13 @@
 #include  <fcntl.h>
 #include  <string.h>
 
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef putc
+#define getc    getc_unlocked
+#define putc    putc_unlocked
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -63,8 +70,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);