[Emacs-diffs] trunk r116559: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 116559
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16825
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-25 11:21:05 -0800
message:
  Merge from gnulib.
  
  2014-02-25 unistd: port readlink to Mac OS X 10.3.9
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  lib/unistd.in.h                unistd.in.h-20110109071402-7rc382anf65r2ire-6

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-02-24 07:12:42 +0000
+++ b/ChangeLog 2014-02-25 19:21:05 +0000
@@ -1,3 +1,8 @@
+2014-02-25  Paul Eggert  <address@hidden>
+
+       Merge from gnulib (Bug#16825).
+       2014-02-25 unistd: port readlink to Mac OS X 10.3.9
+
 2014-02-24  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'lib/unistd.in.h'
--- a/lib/unistd.in.h   2014-01-01 07:43:34 +0000
+++ b/lib/unistd.in.h   2014-02-25 19:21:05 +0000
@@ -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.  */
+
address@hidden@ @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_INLINE_HEADER_END
 
 #endif /* address@hidden@_UNISTD_H */
+#endif /* _GL_INCLUDING_UNISTD_H */
 #endif /* address@hidden@_UNISTD_H */