--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-04-25  Bruno Haible  <bruno@clisp.org>
+
+	Use the 'extensions' module for some more functions on Solaris.
+	* doc/posix-functions/asctime_r.texi: Recommend to use the 'extensions'
+	module.
+	* doc/posix-functions/ctime_r.texi: Likewise.
+	* doc/posix-functions/getgrgid_r.texi: Likewise.
+	* doc/posix-functions/getgrnam_r.texi: Likewise.
+	* doc/posix-functions/getpwnam_r.texi: Likewise.
+	* doc/posix-functions/getpwuid_r.texi: Likewise.
+	* doc/posix-functions/readdir_r.texi: Likewise.
+	* doc/posix-functions/sigwait.texi: Likewise.
+	* m4/getlogin_r.m4 (gl_FUNC_GETLOGIN_R): Add comment.
+	* doc/posix-functions/getlogin_r.texi: Mark Solaris problem as fixed.
+
 2010-04-25  Bruno Haible  <bruno@clisp.org>
 
 	ttyname_r: Make it work on MacOS X 10.4 and Solaris 10.

--- a/doc/posix-functions/asctime_r.texi
+++ b/doc/posix-functions/asctime_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/asctime_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -16,9 +19,6 @@
 This function is missing on some platforms:
 mingw.
 @item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
-@item
 This function may put more than 26 bytes into the argument buffer if an
 invalid year is passed.
 @end itemize

--- a/doc/posix-functions/ctime_r.texi
+++ b/doc/posix-functions/ctime_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/ctime_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -16,9 +19,6 @@
 This function is missing on some platforms:
 mingw.
 @item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
-@item
 This function may put more than 26 bytes into the argument buffer if an
 invalid year is passed.
 @end itemize

--- a/doc/posix-functions/getgrgid_r.texi
+++ b/doc/posix-functions/getgrgid_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/getgrgid_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -15,7 +18,4 @@
 @item
 This function is missing on some platforms:
 mingw, BeOS.
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/getgrnam_r.texi
+++ b/doc/posix-functions/getgrnam_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/getgrnam_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -15,7 +18,4 @@
 @item
 This function is missing on some platforms:
 mingw, BeOS.
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/getlogin_r.texi
+++ b/doc/posix-functions/getlogin_r.texi
@@ -11,11 +11,11 @@
 @item
 This function is missing on some platforms:
 NetBSD 3.0, mingw.
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/getpwnam_r.texi
+++ b/doc/posix-functions/getpwnam_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/getpwnam_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -15,7 +18,4 @@
 @item
 This function is missing on some platforms:
 OpenBSD 3.8, mingw, BeOS.
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/getpwuid_r.texi
+++ b/doc/posix-functions/getpwuid_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/getpwuid_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -15,7 +18,4 @@
 @item
 This function is missing on some platforms:
 OpenBSD 3.8, mingw, BeOS.
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/readdir_r.texi
+++ b/doc/posix-functions/readdir_r.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/readdir_r.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -15,7 +18,4 @@
 @item
 This function is missing on some platforms:
 mingw, BeOS.
-@item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize

--- a/doc/posix-functions/sigwait.texi
+++ b/doc/posix-functions/sigwait.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/sigwait.html}
 
-Gnulib module: ---
+Gnulib module: extensions
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function has an incompatible declaration on some platforms:
+Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
 @end itemize
 
 Portability problems not fixed by Gnulib:
@@ -16,9 +19,6 @@
 This function is missing on some platforms:
 mingw, BeOS.
 @item
-This function has an incompatible declaration on some platforms:
-Solaris 10 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined).
-@item
 On Linux/glibc platforms before the advent of NPTL, signals could only be
 sent to one particular thread.  In POSIX, signals are sent to the entire
 process and executed by any thread of the process that happens to have the

--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 # Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
 #
@@ -16,6 +16,8 @@
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
 
   dnl Persuade glibc <unistd.h> to declare getlogin_r().
+  dnl Persuade Solaris <unistd.h> to provide the POSIX compliant declaration of
+  dnl getlogin_r().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_FUNCS_ONCE([getlogin_r])