Deprecate external use of libio.h and _G_config.h.

[platform/upstream/glibc.git] / bits / select.h

diff --git a/bits/select.h b/bits/select.h
index f886aec..cb3898e 100644 (file)
--- a/bits/select.h
+++ b/bits/select.h
@@ -1,20 +1,19 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SYS_SELECT_H
 # error "Never use <bits/select.h> directly; include <sys/select.h> instead."
@@ -23,26 +22,16 @@
 
 /* We don't use `memset' because this would require a prototype and
    the array isn't too big.  */
-#ifdef __USE_XOPEN
-# define __FD_ZERO(s) \
+#define __FD_ZERO(s) \
   do {                                                                       \
     unsigned int __i;                                                        \
-    __fd_set *__arr = (s);                                                   \
-    for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i)       \
-      __arr->fds_bits[__i] = '\0';                                           \
+    fd_set *__arr = (s);                                                     \
+    for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i)         \
+      __FDS_BITS (__arr)[__i] = 0;                                           \
   } while (0)
-# define __FD_SET(d, s)     ((s)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-# define __FD_CLR(d, s)     ((s)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-# define __FD_ISSET(d, s)   (((s)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)
-#else
-# define __FD_ZERO(s) \
-  do {                                                                       \
-    unsigned int __i;                                                        \
-    __fd_set *__arr = (s);                                                   \
-    for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i)       \
-      __arr->__fds_bits[__i] = '\0';                                         \
-  } while (0)
-# define __FD_SET(d, s)     ((s)->__fds_bits[__FDELT(d)] |= __FDMASK(d))
-# define __FD_CLR(d, s)     ((s)->__fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-# define __FD_ISSET(d, s)   (((s)->__fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)
-#endif
+#define __FD_SET(d, s) \
+  ((void) (__FDS_BITS (s)[__FD_ELT(d)] |= __FD_MASK(d)))
+#define __FD_CLR(d, s) \
+  ((void) (__FDS_BITS (s)[__FD_ELT(d)] &= ~__FD_MASK(d)))
+#define __FD_ISSET(d, s) \
+  ((__FDS_BITS (s)[__FD_ELT (d)] & __FD_MASK (d)) != 0)