procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnulib.

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

Fixes: debbugs:16825
This commit is contained in:
Paul Eggert 2014-02-25 11:21:05 -08:00
parent 591debed68
commit cc58740405
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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:

15
lib/unistd.in.h
View file

@ -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 */