Merge commit 'upstream/0.1.7a.dfsg'

[samtools.git] / knetfile.h

diff --git a/knetfile.h b/knetfile.h
index 9021b937ac211c1459ef1afec3c20b49ce6007a1..0a0e66f7a0aaeb65eac7068b687a5af945419e70 100644 (file)
--- a/knetfile.h
+++ b/knetfile.h
@@ -9,7 +9,7 @@
 #define netwrite(fd, ptr, len) write(fd, ptr, len)
 #define netclose(fd) close(fd)
 #else
-#include <winsock.h>
+#include <winsock2.h>
 #define netread(fd, ptr, len) recv(fd, ptr, len, 0)
 #define netwrite(fd, ptr, len) send(fd, ptr, len, 0)
 #define netclose(fd) closesocket(fd)
@@ -28,8 +28,9 @@ typedef struct knetFile_s {
 
        // the following are for FTP only
        int ctrl_fd, pasv_ip[4], pasv_port, max_response, no_reconnect, is_ready;
-       char *response, *retr;
+       char *response, *retr, *size_cmd;
        int64_t seek_offset; // for lazy seek
+    int64_t file_size;
 
        // the following are for HTTP only
        char *path, *http_host;
@@ -64,7 +65,7 @@ extern "C" {
          This routine only sets ->offset and ->is_ready=0. It does not
          communicate with the FTP server.
         */
-       int knet_seek(knetFile *fp, off_t off, int whence);
+       off_t knet_seek(knetFile *fp, int64_t off, int whence);
        int knet_close(knetFile *fp);
 
 #ifdef __cplusplus