some fixes

1 files changed, 8 insertions, 8 deletions

diff --git a/gcc-djgpp.diff b/gcc-djgpp.diff
index 961640c8dcf8..ed2a2cbf0366 100644
--- a/gcc-djgpp.diff
+++ b/gcc-djgpp.diff
@@ -1,5 +1,5 @@
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 3b0aea92c05..02013b9f01a 100644
+index 41434655865..a3bfd1c24e1 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
 @@ -247,6 +247,12 @@ char __gnat_dir_separator = DIR_SEPARATOR;
@@ -325,10 +325,10 @@ index 1299159a7f1..e1bd7a1c633 100644
  	  file_mode |= S_ISVTX;
  	else if (!is_dir)
 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
-index a8fd07a5f3b..385640ab903 100644
+index 428760fc315..682c305fe52 100644
 --- a/libgfortran/io/unix.c
 +++ b/libgfortran/io/unix.c
-@@ -210,6 +210,9 @@ typedef struct
+@@ -218,6 +218,9 @@ typedef struct
  }
  unix_stream;
  
@@ -338,7 +338,7 @@ index a8fd07a5f3b..385640ab903 100644
  
  /* fix_fd()-- Given a file descriptor, make sure it is not one of the
     standard descriptors, returning a non-standard descriptor.  If the
-@@ -1190,8 +1193,13 @@ tempfile_open (const char *tempdir, char **fname)
+@@ -1198,8 +1201,13 @@ tempfile_open (const char *tempdir, char **fname)
    char *template = xmalloc (tempdirlen + 23);
  
  #ifdef HAVE_MKSTEMP
@@ -352,7 +352,7 @@ index a8fd07a5f3b..385640ab903 100644
  
  #ifdef HAVE_UMASK
    /* Temporarily set the umask such that the file has 0600 permissions.  */
-@@ -1557,6 +1565,13 @@ open_external (st_parameter_open *opp, unit_flags *flags)
+@@ -1565,6 +1573,13 @@ open_external (st_parameter_open *opp, unit_flags *flags)
      return NULL;
    fd = fix_fd (fd);
  
@@ -495,7 +495,7 @@ index 4e5590f9160..f78405afa03 100644
  
  #ifdef _GLIBCXX_HAVE_EOWNERDEAD
 diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
-index ada7c1791aa..1ec60b2ffc9 100644
+index 088d62f8f43..9cba93e5719 100644
 --- a/libstdc++-v3/include/experimental/bits/fs_path.h
 +++ b/libstdc++-v3/include/experimental/bits/fs_path.h
 @@ -53,6 +53,11 @@
@@ -510,7 +510,7 @@ index ada7c1791aa..1ec60b2ffc9 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -461,6 +466,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
+@@ -463,6 +468,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
      {
  #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
        return __ch == L'/' || __ch == preferred_separator;
@@ -519,7 +519,7 @@ index ada7c1791aa..1ec60b2ffc9 100644
  #else
        return __ch == '/';
  #endif
-@@ -831,6 +838,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
+@@ -833,6 +840,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
  #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
      std::replace(_M_pathname.begin(), _M_pathname.end(), L'/',
  		 preferred_separator);