pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #15940 from j-hao/master

emacs|emacs25pre: Check AT_FDCWD is not defined before define it

Joachim Fasting 236cfe4e e65698db

+8 -4
unified split
+4 -2
pkgs/applications/editors/emacs-24/at-fdcwd.patch
··· 1 diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h 2 - index 5cdb813..7a272e8 100644 3 --- a/lib/careadlinkat.h 4 +++ b/lib/careadlinkat.h 5 - @@ -23,6 +23,8 @@ 6 #include <fcntl.h> 7 #include <unistd.h> 8 9 +#define AT_FDCWD -2 10 + 11 struct allocator; 12
··· 1 diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h 2 + index 84ede3e..8e8f42e 100644 3 --- a/lib/careadlinkat.h 4 +++ b/lib/careadlinkat.h 5 + @@ -23,6 +23,10 @@ 6 #include <fcntl.h> 7 #include <unistd.h> 8 9 + +#ifndef AT_FDCWD 10 +#define AT_FDCWD -2 11 + +#endif 12 + 13 struct allocator; 14
+4 -2
pkgs/applications/editors/emacs-25/at-fdcwd.patch
··· 1 diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h 2 - index 5cdb813..7a272e8 100644 3 --- a/lib/careadlinkat.h 4 +++ b/lib/careadlinkat.h 5 - @@ -23,6 +23,8 @@ 6 #include <fcntl.h> 7 #include <unistd.h> 8 9 +#define AT_FDCWD -2 10 + 11 struct allocator; 12
··· 1 diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h 2 + index 84ede3e..8e8f42e 100644 3 --- a/lib/careadlinkat.h 4 +++ b/lib/careadlinkat.h 5 + @@ -23,6 +23,10 @@ 6 #include <fcntl.h> 7 #include <unistd.h> 8 9 + +#ifndef AT_FDCWD 10 +#define AT_FDCWD -2 11 + +#endif 12 + 13 struct allocator; 14