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 vfs_file_is_local() at non-vfs build

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT service 2009-12-29 04:57:40 +01:00 committed by Slava Zanko
parent 49c83d786c
commit 54f302e2c9
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

@ -55,7 +55,6 @@ return_zero (void)
#define mc_getlocalcopy(x) vfs_canon(x) #define mc_getlocalcopy(x) vfs_canon(x)
#define mc_ungetlocalcopy(x,y,z) do { } while (0) #define mc_ungetlocalcopy(x,y,z) do { } while (0)
#define vfs_file_is_local(x) 1
#define vfs_strip_suffix_from_filename(x) g_strdup(x) #define vfs_strip_suffix_from_filename(x) g_strdup(x)
#define vfs_file_class_flags(x) (VFSF_LOCAL) #define vfs_file_class_flags(x) (VFSF_LOCAL)

3
vfs/vfs.h
View File

@ -17,12 +17,14 @@ void vfs_init (void);
void vfs_shut (void); void vfs_shut (void);
int vfs_current_is_local (void); int vfs_current_is_local (void);
int vfs_file_is_local (const char *filename);
#else /* USE_VFS */ #else /* USE_VFS */
#define vfs_init() do { } while (0) #define vfs_init() do { } while (0)
#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)
#endif /* USE_VFS */ #endif /* USE_VFS */
@ -30,7 +32,6 @@ char *vfs_strip_suffix_from_filename (const char *filename);
char *vfs_canon (const char *path); char *vfs_canon (const char *path);
char *mc_get_current_wd (char *buffer, int bufsize); char *mc_get_current_wd (char *buffer, int bufsize);
char *vfs_get_current_dir (void); char *vfs_get_current_dir (void);
int vfs_file_is_local (const char *filename);
/* translate path back to terminal encoding, remove all #enc: /* translate path back to terminal encoding, remove all #enc:
* every invalid character is replaced with question mark * every invalid character is replaced with question mark
* return static buffer */ * return static buffer */