tcgetsid: Add missing declaration on OSF/1 5.1.

* lib/termios.in.h (tcgetsid): Test HAVE_DECL_TCGETSID instead of
HAVE_TCGETSID.
* m4/tcgetsid.m4 (gl_FUNC_TCGETSID): Test whether tcgetsid is declared.
Don't set HAVE_TCGETSID.
* m4/termios_h.m4 (gl_TERMIOS_H_DEFAULTS): Initialize
HAVE_DECL_TCGETSID, not HAVE_TCGETSID.
* modules/termios (Makefile.am): Substitute HAVE_DECL_TCGETSID, not
HAVE_TCGETSID.
* doc/posix-functions/tcgetsid.texi: Mention the OSF/1 5.1 problem.

diff --git a/ChangeLog b/ChangeLog
index 62a20ce952abd0dd34d36dbac2cf2777fda05bbb..8f085346d2f7cadd920e10df8fe5a56b391d6b5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-19  Bruno Haible  <bruno@clisp.org>
+
+       tcgetsid: Add missing declaration on OSF/1 5.1.
+       * lib/termios.in.h (tcgetsid): Test HAVE_DECL_TCGETSID instead of
+       HAVE_TCGETSID.
+       * m4/tcgetsid.m4 (gl_FUNC_TCGETSID): Test whether tcgetsid is declared.
+       Don't set HAVE_TCGETSID.
+       * m4/termios_h.m4 (gl_TERMIOS_H_DEFAULTS): Initialize
+       HAVE_DECL_TCGETSID, not HAVE_TCGETSID.
+       * modules/termios (Makefile.am): Substitute HAVE_DECL_TCGETSID, not
+       HAVE_TCGETSID.
+       * doc/posix-functions/tcgetsid.texi: Mention the OSF/1 5.1 problem.
+
 2010-12-19  Bruno Haible  <bruno@clisp.org>
 
        stdio: Fix problem with popen() declaration on OSF/1 5.1.

diff --git a/doc/posix-functions/tcgetsid.texi b/doc/posix-functions/tcgetsid.texi
index 5e1a43bb8aff57ace745358ea6bd5a96702ec07b..1bcc4d042474f1b4628a357ed009834db0b73f54 100644 (file)
--- a/doc/posix-functions/tcgetsid.texi
+++ b/doc/posix-functions/tcgetsid.texi
@@ -8,8 +8,12 @@ Gnulib module: tcgetsid
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
 This function is missing on some platforms:
 MacOS X 10.3, FreeBSD 6.0, OpenBSD 4.5, Cygwin, mingw, Interix 3.5, BeOS.
+@item
+This function is not declared on some platforms:
+OSF/1 5.1.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/lib/termios.in.h b/lib/termios.in.h
index 10ef3e7accb0bbd678cf2e5ca342947627e991a0..02c6c39e1d35af6ac5f9e961b74e916f95f990d1 100644 (file)
--- a/lib/termios.in.h
+++ b/lib/termios.in.h
@@ -47,7 +47,7 @@
    The argument is a descriptor if this controlling terminal.
    Return -1, with errno set, upon failure.  errno = ENOSYS means that the
    function is unsupported.  */
-# if !@HAVE_TCGETSID@
+# if !@HAVE_DECL_TCGETSID@
 _GL_FUNCDECL_SYS (tcgetsid, pid_t, (int fd));
 # endif
 _GL_CXXALIAS_SYS (tcgetsid, pid_t, (int fd));

diff --git a/m4/tcgetsid.m4 b/m4/tcgetsid.m4
index 11dcc3d599306c2b63e65708dc080e674a6739ea..96efb3ad792b89704632c75c873597cb56db8332 100644 (file)
--- a/m4/tcgetsid.m4
+++ b/m4/tcgetsid.m4
@@ -1,4 +1,4 @@
-# tcgetsid.m4 serial 1
+# tcgetsid.m4 serial 2
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,9 +11,13 @@ AC_DEFUN([gl_FUNC_TCGETSID],
   dnl Persuade glibc <termios.h> to declare tcgetsid().
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
+  AC_CHECK_DECLS_ONCE([tcgetsid])
+  if test $ac_cv_have_decl_tcgetsid = no; then
+    HAVE_DECL_TCGETSID=0
+  fi
+
   AC_CHECK_FUNCS([tcgetsid])
   if test $ac_cv_func_tcgetsid = no; then
-    HAVE_TCGETSID=0
     AC_LIBOBJ([tcgetsid])
     gl_PREREQ_TCGETSID
   fi

diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index 151cc4fc968b49a696cbb1a4a90929ac15278e80..1641cb82d5221053abc17b4fe5d398158b509a42 100644 (file)
--- a/m4/termios_h.m4
+++ b/m4/termios_h.m4
@@ -1,4 +1,4 @@
-# termios_h.m4 serial 1
+# termios_h.m4 serial 2
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -37,6 +37,6 @@ AC_DEFUN([gl_TERMIOS_H_DEFAULTS],
 [
   GNULIB_TCGETSID=0;      AC_SUBST([GNULIB_TCGETSID])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_TCGETSID=1;        AC_SUBST([HAVE_TCGETSID])
+  HAVE_DECL_TCGETSID=1;   AC_SUBST([HAVE_DECL_TCGETSID])
   HAVE_TERMIOS_H=1;       AC_SUBST([HAVE_TERMIOS_H])
 ])

diff --git a/modules/termios b/modules/termios
index 8c9ceba1da66693078918b9f2ba05f4b102b7382..09539f611882794a14518b591360ae007e82ef1c 100644 (file)
--- a/modules/termios
+++ b/modules/termios
@@ -26,7 +26,7 @@ termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
              -e 's|@''GNULIB_TCGETSID''@|$(GNULIB_TCGETSID)|g' \
-             -e 's|@''HAVE_TCGETSID''@|$(HAVE_TCGETSID)|g' \
+             -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \
              -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \