diff options
author | Andy Wingo <wingo@pobox.com> | 2011-12-19 18:00:28 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-12-19 18:00:28 +0100 |
commit | 296004b3ba34139292eb1d8bf54739ee1a082712 (patch) | |
tree | 149e2c87f169583ade59bbb876530fc03af9b2ea /lib/stdlib.in.h | |
parent | bfe35b90ff0c7f78335e70bdb26ea3466f6e98d9 (diff) | |
parent | 52b680f85e84689778f10ed8f9e72adf8316fbe7 (diff) | |
download | guile-296004b3ba34139292eb1d8bf54739ee1a082712.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/feature.c
m4/gnulib-cache.m4
module/ice-9/deprecated.scm
module/language/tree-il/peval.scm
Diffstat (limited to 'lib/stdlib.in.h')
-rw-r--r-- | lib/stdlib.in.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index f5a846a06..2b453bae5 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -247,7 +247,7 @@ _GL_CXXALIASWARN (grantpt); #elif defined GNULIB_POSIXCHECK # undef grantpt # if HAVE_RAW_DECL_GRANTPT -_GL_WARN_ON_USE (ptsname, "grantpt is not portable - " +_GL_WARN_ON_USE (grantpt, "grantpt is not portable - " "use gnulib module grantpt for portability"); # endif #endif @@ -455,6 +455,32 @@ _GL_WARN_ON_USE (ptsname, "ptsname is not portable - " # endif #endif +#if @GNULIB_PTSNAME_R@ +/* Set the pathname of the pseudo-terminal slave associated with + the master FD is open on and return 0, or set errno and return + non-zero on errors. */ +# if @REPLACE_PTSNAME_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ptsname_r +# define ptsname_r rpl_ptsname_r +# endif +_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len)); +_GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len)); +# else +# if !@HAVE_PTSNAME_R@ +_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); +# endif +_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); +# endif +_GL_CXXALIASWARN (ptsname_r); +#elif defined GNULIB_POSIXCHECK +# undef ptsname_r +# if HAVE_RAW_DECL_PTSNAME_R +_GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - " + "use gnulib module ptsname_r for portability"); +# endif +#endif + #if @GNULIB_PUTENV@ # if @REPLACE_PUTENV@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |