Oops, fix last commit.

diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 22cde114e796a4a5a9496c31738f72a384835356..412261303701cf19c74b9ac3284fcc73b771d517 100644 (file)
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -359,7 +359,7 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - "
    implementation relies on futimesat, which on Solaris 10 makes an invocation
    to futimens that is meant to invoke the libc's futimens(), not gnulib's
    futimens().  */
    implementation relies on futimesat, which on Solaris 10 makes an invocation
    to futimens that is meant to invoke the libc's futimens(), not gnulib's
    futimens().  */

-# if @REPLACE_FUTIMENS@ || defined __sun
+# if @REPLACE_FUTIMENS@ || (!@HAVE_FUTIMENS@ && defined __sun)

 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef futimens
 #   define futimens rpl_futimens
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef futimens
 #   define futimens rpl_futimens


@@ -622,7 +622,7 @@ _GL_WARN_ON_USE (stat, "stat is unportable - "
    implementation relies on futimesat, which on Solaris 10 makes an invocation
    to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
    utimensat().  */
    implementation relies on futimesat, which on Solaris 10 makes an invocation
    to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
    utimensat().  */

-# if @REPLACE_UTIMENSAT@ || defined __sun
+# if @REPLACE_UTIMENSAT@ || (!@HAVE_UTIMENSAT@ && defined __sun)

 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef utimensat
 #   define utimensat rpl_utimensat
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef utimensat
 #   define utimensat rpl_utimensat