public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15940 from j-hao/master

Browse Source 
emacs|emacs25pre: Check AT_FDCWD is not defined before define it
This commit is contained in:
Joachim Fasting 2016-06-04 02:17:56 +02:00
commit 236cfe4e78
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs-24/at-fdcwd.patch
View File

@ -1,12 +1,14 @@
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
index 5cdb813..7a272e8 100644 index 84ede3e..8e8f42e 100644
--- a/lib/careadlinkat.h --- a/lib/careadlinkat.h
+++ b/lib/careadlinkat.h +++ b/lib/careadlinkat.h
@@ -23,6 +23,8 @@ @@ -23,6 +23,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
+#ifndef AT_FDCWD
+#define AT_FDCWD -2 +#define AT_FDCWD -2
+#endif
+ +
struct allocator; struct allocator;

6
pkgs/applications/editors/emacs-25/at-fdcwd.patch
View File

@ -1,12 +1,14 @@
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
index 5cdb813..7a272e8 100644 index 84ede3e..8e8f42e 100644
--- a/lib/careadlinkat.h --- a/lib/careadlinkat.h
+++ b/lib/careadlinkat.h +++ b/lib/careadlinkat.h
@@ -23,6 +23,8 @@ @@ -23,6 +23,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
+#ifndef AT_FDCWD
+#define AT_FDCWD -2 +#define AT_FDCWD -2
+#endif
+ +
struct allocator; struct allocator;