mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

VFS: fixing symbol clash on mc_read() at non-vfs build

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT service 2009-12-29 05:00:44 +01:00 committed by Slava Zanko
parent 54f302e2c9
commit 1b11c35b2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vfsdummy.h
View File

@ -16,7 +16,6 @@
#define O_LINEAR 0 #define O_LINEAR 0
#define mc_close close #define mc_close close
#define mc_read read
#define mc_write write #define mc_write write
#define mc_lseek lseek #define mc_lseek lseek
#define mc_opendir opendir #define mc_opendir opendir

3
vfs/vfs.h
View File

@ -18,6 +18,7 @@ void vfs_shut (void);
int vfs_current_is_local (void); int vfs_current_is_local (void);
int vfs_file_is_local (const char *filename); int vfs_file_is_local (const char *filename);
ssize_t mc_read (int handle, void *buffer, int count);
#else /* USE_VFS */ #else /* USE_VFS */
@ -25,6 +26,7 @@ int vfs_file_is_local (const char *filename);
#define vfs_shut() do { } while (0) #define vfs_shut() do { } while (0)
#define vfs_current_is_local() (1) #define vfs_current_is_local() (1)
#define vfs_file_is_local(x) (1) #define vfs_file_is_local(x) (1)
#define mc_read read
#endif /* USE_VFS */ #endif /* USE_VFS */
@ -50,7 +52,6 @@ char *vfs_translate_url (const char *url);
int mc_open (const char *filename, int flags, ...); int mc_open (const char *filename, int flags, ...);
int mc_close (int handle); 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); ssize_t mc_write (int handle, const void *buffer, int count);
off_t mc_lseek (int fd, off_t offset, int whence); off_t mc_lseek (int fd, off_t offset, int whence);
int mc_chdir (const char *path); int mc_chdir (const char *path);