Merge from trunk

[gnu-emacs] / lib / sys_select.in.h

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 0aee2a16cbf7d26a470427c3d74a098493f10f44..ae8f90cae74c2aedff3326bfd824734d46266937 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -130,7 +130,7 @@
 
 /* Re-define FD_ISSET to avoid a WSA call while we are not using
    network sockets.  */
-static inline int
+static int
 rpl_fd_isset (SOCKET fd, fd_set * set)
 {
   u_int i;