From b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad Mon Sep 17 00:00:00 2001
From: Jun Hao <jun_hao@aol.com>
Date: Thu, 2 Jun 2016 19:26:18 +0800
Subject: emacs|emacs25pre: Check AT_FDCWD is not defined before define it

https://github.com/NixOS/nixpkgs/issues/11723
---
 pkgs/applications/editors/emacs-24/at-fdcwd.patch | 6 ++++--
 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;
  
-- 
cgit 1.4.1