From 1b11c35b2b251b3f2ea850a92692b00ccee8b381 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT service" Date: Tue, 29 Dec 2009 05:00:44 +0100 Subject: [PATCH] VFS: fixing symbol clash on mc_read() at non-vfs build --- src/vfsdummy.h | 1 - vfs/vfs.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vfsdummy.h b/src/vfsdummy.h index 6dab666cc..7763121c3 100644 --- a/src/vfsdummy.h +++ b/src/vfsdummy.h @@ -16,7 +16,6 @@ #define O_LINEAR 0 #define mc_close close -#define mc_read read #define mc_write write #define mc_lseek lseek #define mc_opendir opendir diff --git a/vfs/vfs.h b/vfs/vfs.h index df85e6b09..812a174ad 100644 --- a/vfs/vfs.h +++ b/vfs/vfs.h @@ -18,6 +18,7 @@ void vfs_shut (void); int vfs_current_is_local (void); int vfs_file_is_local (const char *filename); +ssize_t mc_read (int handle, void *buffer, int count); #else /* USE_VFS */ @@ -25,6 +26,7 @@ int vfs_file_is_local (const char *filename); #define vfs_shut() do { } while (0) #define vfs_current_is_local() (1) #define vfs_file_is_local(x) (1) +#define mc_read read #endif /* USE_VFS */ @@ -50,7 +52,6 @@ char *vfs_translate_url (const char *url); int mc_open (const char *filename, int flags, ...); int mc_close (int handle); -ssize_t mc_read (int handle, void *buffer, int count); ssize_t mc_write (int handle, const void *buffer, int count); off_t mc_lseek (int fd, off_t offset, int whence); int mc_chdir (const char *path); -- 2.11.4.GIT