Some changes to resolve conflicts with dokan_fuse

libnfs-4.0.0-vitalif
Daniel Abrecht 2017-02-26 16:29:00 +00:00
parent 7882711c8c
commit 50bf03bc66
3 changed files with 15 additions and 10 deletions

4
configure.ac Normal file → Executable file
View File

@ -148,6 +148,10 @@ AC_CHECK_HEADERS([sys/vfs.h])
dnl Check for sys/statvfs.h
AC_CHECK_HEADERS([sys/statvfs.h])
# check for fuse.h
dnl Check for fuse.h
AC_CHECK_HEADERS([fuse.h])
# check for sys/socket.h
dnl Check for sys/socket.h
AC_CHECK_HEADERS([sys/socket.h])

17
include/nfsc/libnfs.h Normal file → Executable file
View File

@ -22,14 +22,11 @@
#define _LIBNFS_H_
#include <stdint.h>
#if defined(__ANDROID__)
#include <sys/time.h>
#endif
#if defined(AROS)
#include <sys/time.h>
#endif
#if defined(__APPLE__) && defined(__MACH__)
#if defined(__ANDROID__) || defined(AROS) \
|| ( defined(__APPLE__) && defined(__MACH__) )
#include <sys/time.h>
#else
#include <time.h>
#endif
#ifdef __cplusplus
@ -57,7 +54,10 @@ struct nfs_url {
#define EXTERN
#endif
#if defined(WIN32)
#ifdef WIN32
#ifdef HAVE_FUSE_H
#include <fuse.h>
#else
struct statvfs {
uint32_t f_bsize;
uint32_t f_frsize;
@ -71,6 +71,7 @@ struct statvfs {
uint32_t f_flag;
uint32_t f_namemax;
};
#endif
#if !defined(__MINGW32__)
struct utimbuf {
time_t actime;

4
win32/win32_compat.h Normal file → Executable file
View File

@ -34,8 +34,8 @@ THE SOFTWARE.
#include <sys/stat.h>
#include <time.h>
typedef int uid_t;
typedef int gid_t;
typedef unsigned int uid_t;
typedef unsigned int gid_t;
typedef int socklen_t;
#ifndef S_IRUSR