repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[win32] - fixed bad number casting when using libnfs on 64bit win8 systems - force...
[deb_libnfs.git]
/
lib
/
libnfs-sync.c
diff --git
a/lib/libnfs-sync.c
b/lib/libnfs-sync.c
index c145d8fb5ff894c4921f0b0deb6a83fbf3b0ae8b..baadefa9962df6482ab938823b0da3a51d576c9d 100644
(file)
--- a/
lib/libnfs-sync.c
+++ b/
lib/libnfs-sync.c
@@
-27,12
+27,11
@@
#ifdef WIN32
#include "win32_compat.h"
#ifdef WIN32
#include "win32_compat.h"
-#else
-#include <strings.h>
-#include <netdb.h>
-#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
#include <net/if.h>
#include <net/if.h>
-#endif
/*WIN32*/
+#endif
#ifdef ANDROID
#define statvfs statfs
#ifdef ANDROID
#define statvfs statfs
@@
-50,10
+49,18
@@
#include <sys/ioctl.h>
#endif
#include <sys/ioctl.h>
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@
-62,6
+69,10
@@
#include <netinet/in.h>
#endif
#include <netinet/in.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-197,11
+208,18
@@
static void stat_cb(int status, struct nfs_context *nfs, void *data, void *priva
nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data);
return;
}
nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data);
return;
}
-
- memcpy(cb_data->return_data, data, sizeof(struct stat));
+#ifdef WIN32
+ memcpy(cb_data->return_data, data, sizeof(struct __stat64));
+#else
+ memcpy(cb_data->return_data, data, sizeof(struct stat));
+#endif
}
}
+#ifdef WIN32
+int nfs_stat(struct nfs_context *nfs, const char *path, struct __stat64 *st)
+#else
int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
+#endif
{
struct sync_cb_data cb_data;
{
struct sync_cb_data cb_data;