diff --git a/include/sys/select.h b/include/sys/select.h
index b3bab1d5..387c2a26 100644
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -24,9 +24,32 @@ typedef struct {
 } fd_set;
 
 #define FD_ZERO(s) do { int __i; unsigned long *__b=(s)->fds_bits; for(__i=sizeof (fd_set)/sizeof (long); __i; __i--) *__b++=0; } while(0)
-#define FD_SET(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] |= (1UL<<((d)%(8*sizeof(long)))))
-#define FD_CLR(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] &= ~(1UL<<((d)%(8*sizeof(long)))))
-#define FD_ISSET(d, s) !!((s)->fds_bits[(d)/(8*sizeof(long))] & (1UL<<((d)%(8*sizeof(long)))))
+
+/* Make FD_ISSET(), FD_SET(), and FD_CLR() into static inline functions in order
+ * to silence -Wsign-conversion warnings */
+#define __FD_ISSET(d, s) !!((s)->fds_bits[(d)/(8*sizeof(long))] & (1UL<<((d)%(8*sizeof(long)))))
+static inline int FD_ISSET(int fd, fd_set *fdset)
+{
+	if (fd < 0 || fd >= FD_SETSIZE)
+		return 0;
+	return __FD_ISSET((unsigned)fd, fdset);
+}
+
+#define __FD_SET(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] |= (1UL<<((d)%(8*sizeof(long)))))
+static inline void FD_SET(int fd, fd_set *fdset)
+{
+	if (fd < 0 || fd >= FD_SETSIZE)
+		return;
+	__FD_SET((unsigned)fd, fdset);
+}
+
+#define __FD_CLR(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] &= ~(1UL<<((d)%(8*sizeof(long)))))
+static inline void FD_CLR(int fd, fd_set *fdset)
+{
+	if (fd < 0 || fd >= FD_SETSIZE)
+		return;
+	__FD_CLR((unsigned)fd, fdset);
+}
 
 int select (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, struct timeval *__restrict);
 int pselect (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, const struct timespec *__restrict, const sigset_t *__restrict);