summaryrefslogtreecommitdiff
path: root/lib/stdlib.in.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-11-17 16:20:52 +0100
committerLudovic Courtès <ludo@gnu.org>2012-11-17 16:20:52 +0100
commit7ae4e75af5366086e60fbc2e9454dfd9e5965102 (patch)
tree61ea2340323e17e362de7860824917d3eeb66abd /lib/stdlib.in.h
parent44cd55752aad2a69e1583a2cb37c3b98c5c44ad3 (diff)
downloadguile-7ae4e75af5366086e60fbc2e9454dfd9e5965102.tar.gz
Update Gnulib to v0.0-7695-g26c0590.
* gnulib-local/m4/canonicalize.m4.diff: Remove. * Makefile.am (EXTRA_DIST): Adjust accordingly.
Diffstat (limited to 'lib/stdlib.in.h')
-rw-r--r--lib/stdlib.in.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 72c9dd1ca..b67a3484e 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_NAMESPACE)
+# 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