From: Masamichi Hosoda <trueroad@sea.plala.or.jp>
Date: Fri, 24 Apr 2015 15:47:05 +0000 (+0100)
Subject: Remove cygwin_conv_to_posix_path
X-Git-Tag: release/2.19.19-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f758afb1497e9d95e564844363f23efa5a313321;p=lilypond.git

Remove cygwin_conv_to_posix_path

Issue 4346

Remove cygwin_conv_to_posix_path

cygwin_conv_to_posix_path is
deprecated on cygwin (32bit) and
not available on cygwin64.
It is not needed in a pure
cygwin environment.
---

diff --git a/flower/file-name.cc b/flower/file-name.cc
index eaadadf3ef..c65d8fc7ed 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -33,10 +33,6 @@ using namespace std;
 #include <sys/stat.h>
 #endif
 
-#ifdef __CYGWIN__
-#include <sys/cygwin.h>
-#endif
-
 #ifndef ROOTSEP
 #define ROOTSEP ':'
 #endif
@@ -49,21 +45,6 @@ using namespace std;
 #define EXTSEP '.'
 #endif
 
-#ifdef __CYGWIN__
-static string
-dos_to_posix (const string &file_name)
-{
-  char buf[PATH_MAX] = "";
-  char s[PATH_MAX] = {0};
-  file_name.copy (s, PATH_MAX - 1);
-  /* ugh: char const* argument gets modified.  */
-  int fail = cygwin_conv_to_posix_path (s, buf);
-  if (!fail)
-    return buf;
-  return file_name;
-}
-#endif /* __CYGWIN__ */
-
 /** Use slash as directory separator.  On Windows, they can pretty
     much be exchanged.  */
 #if 0
@@ -144,12 +125,6 @@ File_name::to_string () const
 
 File_name::File_name (string file_name)
 {
-#ifdef __CYGWIN__
-  /* All system functions would work, even if we do not convert to
-     posix file_name, but we would think that \foe\bar\baz.ly is in
-     the cwd.  */
-  file_name = dos_to_posix (file_name);
-#endif
 #ifdef __MINGW32__
   file_name = slashify (file_name);
 #endif