X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclose.c;h=1c06c166f714872ec1da6c40baeff58c87202fba;hb=5bddd6312f3041adf1580f0c791dcb05c0d3ae92;hp=9b050668a8ba9dc3e6b936ec83843ed48910fa34;hpb=59a539f3e601f4639e67d9a6d2a20c9450e642f4;p=gnulib.git

diff --git a/lib/close.c b/lib/close.c
index 9b050668a..1c06c166f 100644
--- a/lib/close.c
+++ b/lib/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +19,7 @@
 /* Specification.  */
 #include <unistd.h>
 
-#if GNULIB_SYS_SOCKET
-# include <sys/socket.h>
-#endif
-
+#include "close-hook.h"
 
 /* Override close() to call into other gnulib modules.  */
 
@@ -30,13 +27,13 @@ int
 rpl_close (int fd)
 #undef close
 {
-#if HAVE__GL_CLOSE_FD_MAYBE_SOCKET
-  int retval = _gl_close_fd_maybe_socket (fd);
+#if WINDOWS_SOCKETS
+  int retval = execute_all_close_hooks (fd);
 #else
   int retval = close (fd);
 #endif
 
-#ifdef FCHDIR_REPLACEMENT
+#if REPLACE_FCHDIR
   if (retval >= 0)
     _gl_unregister_fd (fd);
 #endif