--- ray/src/common/selcall.h	2003/02/22 02:07:22	3.4
+++ ray/src/common/selcall.h	2003/06/30 14:59:11	3.9
@@ -1,73 +1,29 @@
-/* RCSid: $Id: selcall.h,v 3.4 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: selcall.h,v 3.9 2003/06/30 14:59:11 schorsch Exp $ */
 /*
  * header file for select call compatibility
  */
+#ifndef _RAD_SELCALL_H_
+#define _RAD_SELCALL_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
-
+#include <string.h>
 #include <sys/types.h>
-#include <sys/time.h>
+#ifdef _WIN32
+  /*#include <winsock2.h>*/
+#else
+  #include <sys/time.h>
+#endif
 #ifdef INCL_SEL_H
 #include <sys/select.h>
 #endif
 
 #ifndef FD_SETSIZE
-#include <sys/param.h>
+#ifdef _WIN32
+#else
+  #include <sys/param.h>
+#endif
 #define FD_SETSIZE	NOFILE		/* maximum # select file descriptors */
 #endif
 #ifndef FD_SET
@@ -77,9 +33,11 @@
 #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
+}
 #endif
+#endif /* _RAD_SELCALL_H_ */