Ticket #2917: mc-4.8.1.6-1.DATADIR.patch

File mc-4.8.1.6-1.DATADIR.patch, 976 bytes (added by matzeri, 6 years ago)

DATADIR bandguard

  • mc-4.8.1.6/src/filemanager/mountlist.c

    old new  
    214214#endif 
    215215 
    216216#ifdef __CYGWIN__ 
     217/* DATADIR is already used in files pulled by <windows.h> */ 
     218#ifdef DATADIR 
     219#define saveDATADIR DATADIR 
     220#undef DATADIR 
     221#endif 
     222 
    217223#include <windows.h> 
    218224#define ME_REMOTE me_remote 
    219225/* All cygwin mount points include `:' or start with `//'; so it 
    220226   requires a native Windows call to determine remote disks.  */ 
    221227static int 
    222 me_remote (char const *fs_name, char const *fs_type _GL_UNUSED) 
     228me_remote (char const *fs_name, char const *fs_type ) 
    223229{ 
    224230    if (fs_name[0] && fs_name[1] == ':') 
    225231    { 
    me_remote (char const *fs_name, char con 
    236242    } 
    237243    return 1; 
    238244} 
     245 
     246#ifdef saveDATADIR 
     247#define DATADIR saveDATADIR 
     248#undef saveDATADIR 
     249#endif 
     250 
    239251#endif 
    240252#ifndef ME_REMOTE 
    241253/* A file system is `remote' if its Fs_name contains a `:'