X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_socket.in.h;h=63c80fff0cc5b789f1b5f45991a1e85774672a08;hb=04606dd55fd8f1a122a21c4b4e09ab2a36498385;hp=fcb4a22693f4f289413b480383f18735fac7d084;hpb=dbd243d0795137dc4877821dfb3d292fe80bcc5f;p=gnulib.git

diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index fcb4a2269..63c80fff0 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -120,9 +120,9 @@ extern "C" {
 /* Re-define FD_ISSET to avoid a WSA call while we are not using
    network sockets.  */
 static inline int
-rpl_fd_isset (int fd, fd_set * set)
+rpl_fd_isset (SOCKET fd, fd_set * set)
 {
-  int i;
+  u_int i;
   if (set == NULL)
     return 0;
 
@@ -145,6 +145,11 @@ rpl_fd_isset (int fd, fd_set * set)
 #  define close close_used_without_including_unistd_h
 # endif
 
+# if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+#  undef gethostname
+#  define gethostname gethostname_used_without_including_unistd_h
+# endif
+
 # if @GNULIB_SOCKET@
 #  if @HAVE_WINSOCK2_H@
 #   undef socket
@@ -388,11 +393,6 @@ extern int rpl_shutdown (int, int);
 #  define select		select_used_without_including_sys_select_h
 # endif
 
-# if @GNULIB_CLOSE@ && @HAVE_WINSOCK2_H@
-/* Need a gnulib internal function.  */
-#  define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1
-# endif
-
 # ifdef __cplusplus
 }
 # endif