Re: The Inaba patch for tr/// vs. use encoding

[p5sagit/p5-mst-13.2.git] / win32 / win32sck.c

diff --git a/win32/win32sck.c b/win32/win32sck.c
index 4fb2047..cd537b3 100644 (file)
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -35,7 +35,7 @@
 #      define TO_SOCKET(x)     (x)
 #endif /* USE_SOCKETS_AS_HANDLES */
 
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
 #define StartSockets() \
     STMT_START {                                       \
        if (!wsock_started)                             \
@@ -100,7 +100,7 @@ void
 set_socktype(void)
 {
 #ifdef USE_SOCKETS_AS_HANDLES
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
     dTHX;
     if (!w32_init_socktype) {
 #endif
@@ -110,7 +110,7 @@ set_socktype(void)
         */
        setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
                    (char *)&iSockOpt, sizeof(iSockOpt));
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
        w32_init_socktype = 1;
     }
 #endif
@@ -291,7 +291,7 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const
     int r;
 #ifdef USE_SOCKETS_AS_HANDLES
     Perl_fd_set dummy;
-    int i, fd, bit, offset;
+    int i, fd;
     FD_SET nrd, nwr, nex, *prd, *pwr, *pex;
 
     /* winsock seems incapable of dealing with all three null fd_sets,
@@ -482,7 +482,7 @@ my_fclose (FILE *pf)
 
 #undef fstat
 int
-my_fstat(int fd, struct stat *sbufptr)
+my_fstat(int fd, Stat_t *sbufptr)
 {
     /* This fixes a bug in fstat() on Windows 9x.  fstat() uses the
      * GetFileType() win32 syscall, which will fail on Windows 9x.
@@ -492,8 +492,13 @@ my_fstat(int fd, struct stat *sbufptr)
      * sbufptr->st_mode.
      */
     int osf;
-    if (!wsock_started || IsWinNT())
+    if (!wsock_started || IsWinNT()) {
+#if defined(WIN64) || defined(USE_LARGE_FILES)
+       return _fstati64(fd, sbufptr);
+#else
        return fstat(fd, sbufptr);
+#endif
+    }
 
     osf = TO_SOCKET(fd);
     if (osf != -1) {
@@ -512,11 +517,15 @@ my_fstat(int fd, struct stat *sbufptr)
            sbufptr->st_nlink = 1;
            sbufptr->st_uid = sbufptr->st_gid = sbufptr->st_ino = 0;
            sbufptr->st_atime = sbufptr->st_mtime = sbufptr->st_ctime = 0;
-           sbufptr->st_size = (off_t)0;
+           sbufptr->st_size = (Off_t)0;
            return 0;
        }
     }
+#if defined(WIN64) || defined(USE_LARGE_FILES)
+    return _fstati64(fd, sbufptr);
+#else
     return fstat(fd, sbufptr);
+#endif
 }
 
 struct hostent *