--- ray/src/common/words.c	1999/01/29 11:18:23	2.4
+++ ray/src/common/words.c	2003/07/17 09:21:29	2.8
@@ -1,24 +1,19 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id";
 #endif
-
 /*
  * Routines for recognizing and moving about words in strings.
+ *
+ * External symbols declared in standard.h
  */
 
+#include "copyright.h"
+
 #include  <ctype.h>
+#include  <string.h>
 
-#ifdef  BSD
-#define  strchr		index
-#endif
+#include  "rtio.h"
 
-#define  NULL		0
-
-extern char  *strchr();
-
-
 char *
 atos(rs, nb, s)			/* get word from string, returning rs */
 char  *rs;
@@ -135,6 +130,7 @@ register char  *s;
 }
 
 
+int
 isint(s)			/* check integer format */
 char  *s;
 {
@@ -145,6 +141,7 @@ char  *s;
 }
 
 
+int
 isintd(s, ds)			/* check integer format with delimiter set */
 char  *s, *ds;
 {
@@ -155,6 +152,7 @@ char  *s, *ds;
 }
 
 
+int
 isflt(s)			/* check float format */
 char  *s;
 {
@@ -165,6 +163,7 @@ char  *s;
 }
 
 
+int
 isfltd(s, ds)			/* check integer format with delimiter set */
 char  *s, *ds;
 {