--- ray/src/common/rtio.h	2003/06/27 06:53:21	3.1
+++ ray/src/common/rtio.h	2003/07/14 22:23:59	3.3
@@ -1,19 +1,20 @@
-/* RCSid $Id: rtio.h,v 3.1 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: rtio.h,v 3.3 2003/07/14 22:23:59 schorsch Exp $ */
 /*
  *	Radiance i/o and string routines
  */
 
 #ifndef _RAD_RTIO_H_
 #define _RAD_RTIO_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include  <stdio.h>
 #include  <sys/types.h>
 #include  <fcntl.h>
 #include  <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* XXX include paths.h instead */
 #ifndef	 F_OK			/* mode bits for access(2) call */
 #define	 R_OK		4		/* readable */
@@ -21,11 +22,7 @@ extern "C" {
 #define	 X_OK		1		/* executable */
 #define	 F_OK		0		/* exists */
 #endif
-					/* string.h equivalents */
-#ifndef BSD
-#define  index			strchr
-#define  rindex			strrchr
-#endif
+
 			/* <unistd.h> is missing on some systems */
 extern off_t	lseek(int, off_t, int);