From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 25 Feb 2014 19:21:05 +0000 (-0800)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.3.90~357^2~7^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc587404052a60d3d4c4bc542d5618e43e8b44ab;p=emacs.git

Merge from gnulib.

2014-02-25 unistd: port readlink to Mac OS X 10.3.9

Fixes: debbugs:16825
---

diff --git a/ChangeLog b/ChangeLog
index 92254afce31..f0f0a2de5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-25  Paul Eggert  <eggert@penguin.cs.ucla.edu>
+
+	Merge from gnulib (Bug#16825).
+	2014-02-25 unistd: port readlink to Mac OS X 10.3.9
+
 2014-02-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, incorporating:
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 39b128a6da7..622b2287577 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -21,9 +21,23 @@
 #endif
 @PRAGMA_COLUMNS@
 
+#ifdef _GL_INCLUDING_UNISTD_H
+/* Special invocation convention:
+   - On Mac OS X 10.3.9 we have a sequence of nested includes
+     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
+     In this situation, the functions are not yet declared, therefore we cannot
+     provide the C++ aliases.  */
+
+#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+
+#else
+/* Normal invocation convention.  */
+
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
+# define _GL_INCLUDING_UNISTD_H
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# undef _GL_INCLUDING_UNISTD_H
 #endif
 
 /* Get all possible declarations of gethostname().  */
@@ -1539,4 +1553,5 @@ _GL_CXXALIASWARN (write);
 _GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_INCLUDING_UNISTD_H */
 #endif /* _@GUARD_PREFIX@_UNISTD_H */