[win32] - completed win32 port

[deb_libnfs.git] / lib / libnfs.c

diff --git a/lib/libnfs.c b/lib/libnfs.c
index ba7b64893f4ede24fc3b6be4f4eab5774dac09fc..29a276fb5ee0b1d6f3ccfa06b696b428589efa92 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2002,9 +2002,7 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
        FSSTAT3res *res;
        struct nfs_cb_data *data = private_data;
        struct nfs_context *nfs = data->nfs;
-#ifndef WIN32
        struct statvfs svfs;
-#endif/*WIN32*/
 
        if (status == RPC_STATUS_ERROR) {
                data->cb(-EFAULT, nfs, command_data, data->private_data);
@@ -2025,7 +2023,6 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
                return;
        }
 
-#ifndef WIN32
        svfs.f_bsize   = 4096;
        svfs.f_frsize  = 4096;
        svfs.f_blocks  = res->FSSTAT3res_u.resok.tbytes/4096;
@@ -2039,9 +2036,6 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
        svfs.f_namemax = 256;
 
        data->cb(0, nfs, &svfs, data->private_data);
-#else
-  data->cb(0, nfs,NULL, data->private_data);  
-#endif/*WIN32*/
        free_nfs_cb_data(data);
 }
 
@@ -3208,35 +3202,3 @@ const char *nfs_get_export(struct nfs_context *nfs) {
        return nfs->export;
 }
 
-
-#if defined(WIN32)
-int poll(struct pollfd *fds, int nfsd, int timeout)
-{
-       fd_set rfds, wfds, efds;
-       int ret;
-
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       FD_ZERO(&efds);
-       if (fds->events & POLLIN) {
-               FD_SET(fds->fd, &rfds);
-       }
-       if (fds->events & POLLOUT) {
-               FD_SET(fds->fd, &wfds);
-       }
-       FD_SET(fds->fd, &efds);
-       select(fds->fd + 1, &rfds, &wfds, &efds, NULL);
-       fds->revents = 0;
-       if (FD_ISSET(fds->fd, &rfds)) {
-               fds->revents |= POLLIN;
-       }
-       if (FD_ISSET(fds->fd, &wfds)) {
-               fds->revents |= POLLOUT;
-       }
-       if (FD_ISSET(fds->fd, &efds)) {
-               fds->revents |= POLLHUP;
-       }
-       return 1;
-}
-#endif
-