Update.

	* include/sys/socket.h: Declare __libc_sa_len_internal and define
	SA_LEN macro to use it if not NOT_IN_libc.
	* sysdeps/unix/sysv/linux/sa_len.c: Use INTDEF for __libc_sa_len.

	* include/fcntl.h: Declare __open_internal and define __open and
	__libc_open macros if not NOT_IN_libc.
	* sysdeps/generic/open.c: Use INTDEF for __open.
	* sysdeps/mach/hurd/open.c: Likewise.
	* sysdeps/unix/sysv/aix/open.c: Likewise.
	* sysdeps/unix/syscalls.list: Add __open_internal alias.

	* sysdeps/generic/check_fds.c: Make sure newly opened file descriptor
	has correct number.

	* include/fcntl.h: Define __libc_fcntl macro if not NOT_IN_libc.
	* sysdeps/mach/hurd/fcntl.c: Undefine __libc_fcntl as well.
	* sysdeps/unix/sysv/aix/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.

	* include/wctype.h: Declare __iswalpha_l_internal,
	__iswdigit_l_internal, __iswspace_l_internal,
	__iswxdigit_l_internal, and __iswctype_internal.  Define
	__iswalpha_l, __iswctype, __iswdigit_l, __iswspace_l, and
	__iswxdigit_l macros if not NOT_IN_libc.
	* wctype/iswctype.c: Use INTDEF for __iswctype.
	* wctype/wcfuncs_l.c: Use INTDEF for all __iswXXX_l.

3 files changed, 32 insertions, 3 deletions

diff --git a/include/fcntl.h b/include/fcntl.h
index 7ac5feb..f14baf7 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -7,11 +7,19 @@ extern int __libc_open64 (const char *file, int oflag, ...);
 extern int __libc_open (const char *file, int oflag, ...);
 extern int __libc_fcntl (int fd, int cmd, ...);
 extern int __open (__const char *__file, int __oflag, ...);
+extern int __open_internal (__const char *__file, int __oflag, ...)
+     attribute_hidden;
 extern int __fcntl (int __fd, int __cmd, ...);
-extern int __fcntl_internal (int __fd, int __cmd, ...);
+extern int __fcntl_internal (int __fd, int __cmd, ...) attribute_hidden;
 
 #ifndef NOT_IN_libc
 # define __fcntl(fd, cmd, args...) INTUSE(__fcntl) (fd, cmd, ##args)
+# define __open(file, oflag, args...) INTUSE(__open) (file, oflag, ##args)
+# ifdef SHARED
+#  define __libc_fcntl(fd, cmd, args...) __fcntl_internal (fd, cmd, ##args)
+#  define __libc_open(file, oflag, args...) \
+  __open_internal (file, oflag, ##args)
+# endif
 #endif
 
 #endif
diff --git a/include/sys/socket.h b/include/sys/socket.h
index c09eac4..5a8169f 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -34,8 +34,13 @@ extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
 #ifdef _HAVE_SA_LEN
 # define SA_LEN(_x)      (_x)->sa_len
 #else
-# define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
-extern int __libc_sa_len (sa_family_t __af) __THROW;
+extern int __libc_sa_len (sa_family_t __af);
+extern int __libc_sa_len_internal (sa_family_t __af) attribute_hidden;
+# ifndef NOT_IN_libc
+#  define SA_LEN(_x)      INTUSE(__libc_sa_len)((_x)->sa_family)
+# else
+#  define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
+# endif
 #endif
 
 
diff --git a/include/wctype.h b/include/wctype.h
index 2a94491..92fc849 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -3,10 +3,26 @@
 #include <wctype/wctype.h>
 
 /* Internal interfaces.  */
+extern int __iswalpha_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswdigit_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswspace_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswxdigit_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
 extern int __iswspace (wint_t __wc);
 extern int __iswctype (wint_t __wc, wctype_t __desc);
+extern int __iswctype_internal (wint_t __wc, wctype_t __desc) attribute_hidden;
 extern wctype_t __wctype (__const char *__property);
 extern wint_t __towctrans (wint_t __wc, wctrans_t __desc);
 
+#ifndef NOT_IN_libc
+# define __iswalpha_l(wc, loc) INTUSE(__iswalpha_l) (wc, loc)
+# define __iswctype(wc, desc) INTUSE(__iswctype) (wc, desc)
+# define __iswdigit_l(wc, loc) INTUSE(__iswdigit_l) (wc, loc)
+# define __iswspace_l(wc, loc) INTUSE(__iswspace_l) (wc, loc)
+# define __iswxdigit_l(wc, loc) INTUSE(__iswxdigit_l) (wc, loc)
+#endif
 
 #endif