diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-10-04 00:15:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-10-04 00:15:42 -0700 |
| commit | bb1dfdadd507bb4b77595c87875ef807c101ed7b (patch) | |
| tree | eb92a2335896c34e76a9e19362049396b8d0483f /lib/stdlib.in.h | |
| parent | 88d69b7ddca305bb96d6e671300f6724e4f147dd (diff) | |
| download | emacs-bb1dfdadd507bb4b77595c87875ef807c101ed7b.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'lib/stdlib.in.h')
| -rw-r--r-- | lib/stdlib.in.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 1d67ec64c66..8311a2893c8 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -457,10 +457,19 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " #if @GNULIB_PTSNAME@ /* Return the pathname of the pseudo-terminal slave associated with the master FD is open on, or NULL on errors. */ -# if !@HAVE_PTSNAME@ +# if @REPLACE_PTSNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPCE) +# undef ptsname +# define ptsname rpl_ptsname +# endif +_GL_FUNCDECL_RPL (ptsname, char *, (int fd)); +_GL_CXXALIAS_RPL (ptsname, char *, (int fd)); +# else +# if !@HAVE_PTSNAME@ _GL_FUNCDECL_SYS (ptsname, char *, (int fd)); -# endif +# endif _GL_CXXALIAS_SYS (ptsname, char *, (int fd)); +# endif _GL_CXXALIASWARN (ptsname); #elif defined GNULIB_POSIXCHECK # undef ptsname |