VFS: fixing symbol clash on vfs_init() and vfs_shut() at non-vfs build

This commit is contained in:
Enrico Weigelt, metux IT service 2009-12-29 04:51:01 +01:00 committed by Slava Zanko
parent 80b3776c20
commit b86788822d
2 changed files with 9 additions and 3 deletions

View File

@ -55,9 +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_init() 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 vfs_strip_suffix_from_filename(x) g_strdup(x) #define vfs_strip_suffix_from_filename(x) g_strdup(x)

View File

@ -11,9 +11,18 @@
#include <dirent.h> #include <dirent.h>
#include <utime.h> #include <utime.h>
#ifdef USE_VFS
void vfs_init (void); void vfs_init (void);
void vfs_shut (void); void vfs_shut (void);
#else /* USE_VFS */
#define vfs_init() do { } while (0)
#define vfs_shut() do { } while (0)
#endif /* USE_VFS */
char *vfs_strip_suffix_from_filename (const char *filename); 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);