--- ray/src/common/selcall.h	1997/10/28 14:02:29	3.1
+++ ray/src/common/selcall.h	2003/06/06 16:38:47	3.6
@@ -1,11 +1,15 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid $Id: selcall.h,v 3.6 2003/06/06 16:38:47 schorsch Exp $ */
 /*
  * header file for select call compatibility
  */
+#ifndef _RAD_SELCALL_H_
+#define _RAD_SELCALL_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+#include "copyright.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 #ifdef INCL_SEL_H
@@ -23,8 +27,15 @@
 #define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
 #define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
 #define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#ifndef BSD
-#define	bzero(d,n)	memset(d,0,n)
-#endif
+#ifdef BSD
 #define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
+#else
+#define FD_ZERO(p)	memset((char *)(p), 0, sizeof(*(p)))
 #endif
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_SELCALL_H_ */