--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-05  Eric Blake  <eblake@redhat.com>
+
+	faccessat: remove unused wrappers
+	* lib/openat.h (accessat, euidaccesat): Delete, since the mere
+	presence of these wrappers dragged in -lgen on Solaris.
+	Reported by Clemens Brogi; fix suggested by Paul Eggert.
+
 2010-10-05  Jim Meyering  <meyering@redhat.com>
 
 	tests: require @PRAGMA_COLUMNS@ with each @PRAGMA_SYSTEM_HEADER@

--- a/lib/openat.h
+++ b/lib/openat.h
@@ -93,22 +93,10 @@
   return fstatat (fd, name, st, AT_SYMLINK_NOFOLLOW);
 }
 
-#if GNULIB_FACCESSAT
 /* For now, there are no wrappers named laccessat or leuidaccessat,
    since gnulib doesn't support faccessat(,AT_SYMLINK_NOFOLLOW) and
-   since access rights on symlinks are of limited utility.  */
-
-static inline int
-accessat (int fd, char const *file, int mode)
-{
-  return faccessat (fd, file, mode, 0);
-}
-
-static inline int
-euidaccessat (int fd, char const *file, int mode)
-{
-  return faccessat (fd, file, mode, AT_EACCESS);
-}
-#endif
+   since access rights on symlinks are of limited utility.  Likewise,
+   wrappers are not provided for accessat or euidaccessat, so as to
+   avoid dragging in -lgen on some platforms.  */
 
 #endif /* _GL_HEADER_OPENAT */