--- ray/src/cv/mgflib/words.c	1995/05/10 17:55:51	1.2
+++ ray/src/cv/mgflib/words.c	2003/03/11 17:08:55	1.4
@@ -1,22 +1,12 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: words.c,v 1.4 2003/03/11 17:08:55 greg Exp $";
 #endif
-
 /*
  * Routines for recognizing and moving about words in strings.
  */
 
+#include  <string.h>
 #include  <ctype.h>
-
-#ifdef  BSD
-#define  strchr		index
-#endif
-
-#define  NULL		0
-
-extern char  *strchr();
 
 
 char *