--- ray/src/common/selcall.h	2003/06/26 00:58:09	3.7
+++ ray/src/common/selcall.h	2016/03/06 01:13:17	3.11
@@ -1,17 +1,13 @@
-/* RCSid $Id: selcall.h,v 3.7 2003/06/26 00:58:09 schorsch Exp $ */
+/* RCSid $Id: selcall.h,v 3.11 2016/03/06 01:13:17 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 <string.h>
 #include <sys/types.h>
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
   /*#include <winsock2.h>*/
 #else
   #include <sys/time.h>
@@ -21,7 +17,7 @@ extern "C" {
 #endif
 
 #ifndef FD_SETSIZE
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 #else
   #include <sys/param.h>
 #endif
@@ -34,13 +30,14 @@ extern "C" {
 #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)))
-#ifdef BSD
-#define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
-#else
 #define FD_ZERO(p)	memset((char *)(p), 0, sizeof(*(p)))
 #endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
+/* nothing yet */
 
 #ifdef __cplusplus
 }