X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..85d88e757d42aea7bc57bc44fed274bdd379926e:/packages/fish/wutil.cpp.patch

diff --git a/packages/fish/wutil.cpp.patch b/packages/fish/wutil.cpp.patch
index eb19041f..bb9a15cf 100644
--- a/packages/fish/wutil.cpp.patch
+++ b/packages/fish/wutil.cpp.patch
@@ -1,17 +1,12 @@
-diff -u -r ../fish-2.1.1/wutil.cpp ./wutil.cpp
---- ../fish-2.1.1/wutil.cpp	2014-09-24 05:51:07.000000000 -0400
-+++ ./wutil.cpp	2015-02-05 17:40:19.462415848 -0500
-@@ -324,11 +324,13 @@
-     // See #808
-     return strerror(err);
- #else
-+# ifndef __ANDROID__
-     if (err >= 0 && err < sys_nerr && sys_errlist[err] != NULL)
-     {
-         return sys_errlist[err];
-     }
-     else
-+# endif
-     {
-         int saved_err = errno;
- 
+diff -u -r ../fish-2.2.0/wutil.cpp ./wutil.cpp
+--- ../fish-2.2.0/wutil.cpp	2015-07-03 15:46:59.000000000 -0400
++++ ./src/wutil.cpp	2015-07-16 08:55:37.131915467 -0400
+@@ -531,7 +531,7 @@
+     result.size = buf->st_size;
+     result.change_seconds = buf->st_ctime;
+     
+-#if STAT_HAVE_NSEC
++#ifdef HAVE_STRUCT_STAT_ST_CTIME_NSEC
+     result.change_nanoseconds = buf->st_ctime_nsec;
+ #elif defined(__APPLE__)
+     result.change_nanoseconds = buf->st_ctimespec.tv_nsec;