pyrox.dev
Merge pull request #15940 from j-hao/master
emacs|emacs25pre: Check AT_FDCWD is not defined before define it
+4
-2
pkgs/applications/editors/emacs-24/at-fdcwd.patch
+4
-2
pkgs/applications/editors/emacs-24/at-fdcwd.patch
···
1
1
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
2
-
index 5cdb813..7a272e8 100644
2
+
index 84ede3e..8e8f42e 100644
3
3
--- a/lib/careadlinkat.h
4
4
+++ b/lib/careadlinkat.h
5
-
@@ -23,6 +23,8 @@
5
+
@@ -23,6 +23,10 @@
6
6
#include <fcntl.h>
7
7
#include <unistd.h>
8
8
9
+
+#ifndef AT_FDCWD
9
10
+#define AT_FDCWD -2
11
+
+#endif
10
12
+
11
13
struct allocator;
12
14
+4
-2
pkgs/applications/editors/emacs-25/at-fdcwd.patch
+4
-2
pkgs/applications/editors/emacs-25/at-fdcwd.patch
···
1
1
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
2
-
index 5cdb813..7a272e8 100644
2
+
index 84ede3e..8e8f42e 100644
3
3
--- a/lib/careadlinkat.h
4
4
+++ b/lib/careadlinkat.h
5
-
@@ -23,6 +23,8 @@
5
+
@@ -23,6 +23,10 @@
6
6
#include <fcntl.h>
7
7
#include <unistd.h>
8
8
9
+
+#ifndef AT_FDCWD
9
10
+#define AT_FDCWD -2
11
+
+#endif
10
12
+
11
13
struct allocator;
12
14