diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 21:43:04 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 23:13:19 +0100 |
commit | 0f00f2c33a85842a9611ed63f07e915ea9fd60de (patch) | |
tree | a02ec2b230021798eb854693c6c9270c6a1f87e6 /lib/stdio.in.h | |
parent | cb26e97a88e90d04e6d4efe3de0de92dea53d1e5 (diff) | |
download | guile-0f00f2c33a85842a9611ed63f07e915ea9fd60de.tar.gz |
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120.
* m4/gnulib-cache.m4: Add `nproc'.
Diffstat (limited to 'lib/stdio.in.h')
-rw-r--r-- | lib/stdio.in.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/stdio.in.h b/lib/stdio.in.h index d39b7dd52..fbd096a21 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -19,6 +19,7 @@ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif +@PRAGMA_COLUMNS@ #if defined __need_FILE || defined __need___FILE /* Special invocation convention inside glibc header files. */ @@ -56,6 +57,13 @@ # endif #endif +/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>. */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \ + && ! defined __GLIBC__ +# include <unistd.h> +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -265,7 +273,8 @@ _GL_CXXALIASWARN (freopen); #elif defined GNULIB_POSIXCHECK # undef freopen /* Assume freopen is always declared. */ -_GL_WARN_ON_USE (freopen, "freopen on Win32 platforms is not POSIX compatible - " +_GL_WARN_ON_USE (freopen, + "freopen on Win32 platforms is not POSIX compatible - " "use gnulib module freopen for portability"); #endif |