X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_socket.in.h;h=63c80fff0cc5b789f1b5f45991a1e85774672a08;hb=b314ca18dc36e59297f66b2508fd58535a1cd724;hp=91a6b33a5c48628c6b35a4412451999ef0cd568f;hpb=49577adb63848cfb501199419a1cf838ff139918;p=gnulib.git

diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index 91a6b33a5..63c80fff0 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -145,6 +145,11 @@ rpl_fd_isset (SOCKET 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