diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-06-04 02:17:56 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-06-04 02:17:56 +0200 |
| commit | 236cfe4e78616375b7e397a6c071ca7682071dfc (patch) | |
| tree | 33c8da288217f8b819065a979643c1f223c45f00 | |
| parent | e65698db0ba04c1685666fc9d541dcf07901278b (diff) | |
| parent | b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad (diff) | |
| download | nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar.gz nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar.bz2 nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar.lz nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar.xz nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.tar.zst nixlib-236cfe4e78616375b7e397a6c071ca7682071dfc.zip | |
Merge pull request #15940 from j-hao/master
emacs|emacs25pre: Check AT_FDCWD is not defined before define it
| -rw-r--r-- | pkgs/applications/editors/emacs-24/at-fdcwd.patch | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-25/at-fdcwd.patch | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-24/at-fdcwd.patch b/pkgs/applications/editors/emacs-24/at-fdcwd.patch index 1f99d4e18094..2d8099b73736 100644 --- a/pkgs/applications/editors/emacs-24/at-fdcwd.patch +++ b/pkgs/applications/editors/emacs-24/at-fdcwd.patch @@ -1,12 +1,14 @@ diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 5cdb813..7a272e8 100644 +index 84ede3e..8e8f42e 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h -@@ -23,6 +23,8 @@ +@@ -23,6 +23,10 @@ #include <fcntl.h> #include <unistd.h> ++#ifndef AT_FDCWD +#define AT_FDCWD -2 ++#endif + struct allocator; diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch index 1f99d4e18094..2d8099b73736 100644 --- a/pkgs/applications/editors/emacs-25/at-fdcwd.patch +++ b/pkgs/applications/editors/emacs-25/at-fdcwd.patch @@ -1,12 +1,14 @@ diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 5cdb813..7a272e8 100644 +index 84ede3e..8e8f42e 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h -@@ -23,6 +23,8 @@ +@@ -23,6 +23,10 @@ #include <fcntl.h> #include <unistd.h> ++#ifndef AT_FDCWD +#define AT_FDCWD -2 ++#endif + struct allocator; |