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

mc-4.8.1.6/src/filemanager/mountlist.c

@@ -214 +214 @@
 #endif
 
 #ifdef __CYGWIN__
+/* DATADIR is already used in files pulled by <windows.h> */
+#ifdef DATADIR
+#define saveDATADIR DATADIR
+#undef DATADIR
+#endif
+
 #include <windows.h>
 #define ME_REMOTE me_remote
 /* All cygwin mount points include `:' or start with `//'; so it
    requires a native Windows call to determine remote disks.  */
 static int
-me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
+me_remote (char const *fs_name, char const *fs_type )
 {
     if (fs_name[0] && fs_name[1] == ':')
     {
@@ -236 +242 @@
     }
     return 1;
 }
+
+#ifdef saveDATADIR
+#define DATADIR saveDATADIR
+#undef saveDATADIR
+#endif
+
 #endif
 #ifndef ME_REMOTE
 /* A file system is `remote' if its Fs_name contains a `:'