Backout r624. It is wrong way.

SVN-Revision: 628

diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c
index 028c0862ec4bdee5e7c28b2248e59aec49db0264..314616d2d7d054204ff372920777bfd508263b53 100644 (file)
--- a/libarchive/archive_windows.c
+++ b/libarchive/archive_windows.c
@@ -522,16 +522,6 @@ la_chmod(const char *path, mode_t mode)
        return (r);
 }
 
-int
-la_close(int fd)
-{
-
-       /* Avoid assertion */
-       if (fd < 0)
-               return (0);
-       return _close(fd);
-}
-
 __int64
 la_lseek(int fd, __int64 offset, int whence)
 {

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 04dd1760e6fc14093fca12d353d6d5088c15092c..fc95d58bc08a07d88f0213c8735c5dc33befaf2c 100644 (file)
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -81,7 +81,7 @@
 #define        access          _access
 #define        chdir           la_chdir
 #define        chmod           la_chmod
-#define        close           la_close
+#define        close           _close
 #define        fileno          _fileno
 #define        fstat           la_fstat
 #define        getcwd          _getcwd
@@ -308,7 +308,6 @@ extern int   utimes(const char *name, const struct __timeval *times);
 /* Replacement POSIX function */
 extern int      la_chdir(const char *path);
 extern int      la_chmod(const char *path, mode_t mode);
-extern int      la_close(int fd);
 extern int      la_fstat(int fd, struct stat *st);
 extern __int64  la_lseek(int fd, __int64 offset, int whence);
 extern int      la_mkdir(const char *path, mode_t mode);