Update.

	* sysdeps/mach/hurd/chown.c: Use INTDEF for __chown.
	* sysdeps/unix/sysv/aix/chown.c: Likewise.
	* sysdeps/unix/grantpt.c: Use INTUSE for __chown calls.
	* sysdeps/unix/sysv/linux/m68k/chown.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/chown.c: Use INTDEF2 to define
	__chown_internal.
	* sysdeps/unix/sysv/linux/s390/s390-32//chown.c: Likewise.

	* intl/dcngettext.c [_LIBC]: Use INTUSE for __dcngettext.
	* intl/dngettext.c [_LIBC] (DCNGETTEXT): Use INTUSE.
	* intl/ngettext.c: Likewise.

	* include/sys/socket.h: Declare __connect_internal and define
	__connect macro if not NOT_IN_libc.
	* sysdeps/mach/hurd/connect.c: Use INTDEF for __connect.
	* sysdeps/unix/sysv/aix/connect.c: Likewise.
	* sysdeps/unix/sysv/linux/connect.S: Add __connect_internal alias.

	* include/unistd.h: Declare __close_internal and define __close macro
	if not NOT_IN_libc.
	* libio/libioP.h (JUMO0, JUMP1, JUMP2, JUMP3, WJUMP0, WJUMP1, WJUMP2,
	WJUMP3): Add extra parenthesis to avoid expanding element names with
	macors like __close.
	* sysdeps/unix/syscalls.list: Add __close_internal alias.

	* include/unistd.h: Declare __dup2_internal and define __dup2 macro
	if not NOT_IN_libc.
	* sysdeps/mach/hurd/dup2.c: Use INTDEF for __dup2.
	* sysdeps/posix/dup2.c: Use INTDEF for __dup2.
	* sysdeps/unix/syscalls.list: Add __dup2_internal alias.

	* include/unistd.h: Declare __fork_internal and define __fork macro
	if not NOT_IN_libc.
	* sysdeps/mach/hurd/fork.c: Use INTDEF for __fork.
	* sysdeps/unix/sysv/aix/fork.c: Likewise.
	* sysdeps/unix/sysv/linux/syscalls.list: Add __fork_internal alias.

	* include/stdio_ext.h: Declare __fsetlocking_internal and define
	__fsetlocking macro to use it if not NOT_IN_libc.
	* libio/__fsetlocking.c: Use INTDEF for __fsetlocking.

	* libio/__fbufsize.c: Correct copyright.
	* libio/__flbf.c: Likewise.
	* libio/__fpending.c: Likewise.
	* libio/__fpurge.c: Likewise.
	* libio/__freadable.c: Likewise.
	* libio/__freading.c: Likewise.
	* libio/__fsetlocking.c: Likewise.
	* libio/__fwritable.c: Likewise.
	* libio/__fwriting.c: Likewise.

	* include/stdio.h: Declare __asprintf_internal and define __asprintf
	macro to use it if not NOT_IN_libc.
	* stdio-common/asprintf.c: Use INTDEF for __asprintf.

	* include/mntent.h: Declare __setmntent_internal,
	__getmntent_r_internal, __endmntent_internal.  Define __setmntent,
	__getmntent_r, and __endmntent macros to use these functions if not
	NOT_IN_libc.
	* misc/mntent_r.c: Use INTDEF for __setmntent, __getmntent_r, and
	__endmntent.

	* include/math.h: Declare __finite_internal, __finitef_internal, and
	__finitel_internal.  Redefine isfinite macro if in libc or libm using
	these functions.
	* sysdeps/generic/s_ldexp.c: Use INTUSE for __finite calls.
	* sysdeps/generic/s_ldexpf.c: Use INTUSE for __finitef calls.
	* sysdeps/generic/s_ldexpl.c: Use INTUSE for __finitel calls.
	* sysdeps/i386/fpu/s_finite.S: Define _internal alias.
	* sysdeps/i386/fpu/s_finitef.S: Likewise.
	* sysdeps/i386/fpu/s_finitel.S: Likewise.
	* sysdeps/ieee754/dbl-64/s_finite.c: Likewise.
	* sysdeps/ieee754/flt-32/s_finitef.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_finitel.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_finitel.c: Likewise.

	* include/fcntl.h: Declare __fcntl_internal.  Define __fcntl macro
	to use this function if not NOT_IN_libc.
	* libio/iofdopen.c (_IO_fcntl): Use INTUSE.
	* sysdeps/generic/fcntl.c: Use INTDEF for __fcntl.
	* sysdeps/mach/hurd/fcntl.c: Likewise.
	* sysdeps/unix/sysv/aix/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.

	* include/argz.h: Declare __argz_count_internal and
	__argz_stringify_internal.
	* intl/l10nflist.c [_LIBC]: Use INTUSE for __argz_count and
	__argz_stringify.
	* string/argz-count.c: Use INTDEF for __argz_count.
	* string/argz-stringify.c: Use INTDEF for __argz_stringify.

	* include/stdlib.h: Declare __cxa_atexit_internal and define
	__cxa_atexit macro if not NOT_IN_libc.
	* stdlib/cxa_atexit.c: Use INTDEF for __cxa_atexit.
	* dlfcn/Makefile: Define NOT_IN_libc when compiling modcxaatexit.c.

	* assert/assert.c: Use INTDEF for __assert_fail.
	* assert/__assert.c: Use INTUSE for call to __assert_fail.
	* include/assert.h: Declare __assert_fail_internal.

10 files changed, 92 insertions, 1 deletions

diff --git a/include/argz.h b/include/argz.h
index 179e693..0b4f8a0 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -1 +1,10 @@
+f#ifndef _ARGZ_H
+
 #include <string/argz.h>
+
+extern size_t __argz_count_internal (__const char *__argz, size_t __len)
+     __attribute_pure__ attribute_hidden;
+extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep)
+     attribute_hidden;
+
+#endif
diff --git a/include/assert.h b/include/assert.h
index e2fa702..e18d373 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1 +1,7 @@
 #include <assert/assert.h>
+
+extern void __assert_fail_internal (__const char *__assertion,
+				    __const char *__file,
+				    unsigned int __line,
+				    __const char *__function)
+     __attribute__ ((__noreturn__)) attribute_hidden;
diff --git a/include/fcntl.h b/include/fcntl.h
index 748854a..7ac5feb 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -7,6 +7,11 @@ 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 __fcntl (int __fd, int __cmd, ...) __THROW;
+extern int __fcntl (int __fd, int __cmd, ...);
+extern int __fcntl_internal (int __fd, int __cmd, ...);
+
+#ifndef NOT_IN_libc
+# define __fcntl(fd, cmd, args...) INTUSE(__fcntl) (fd, cmd, ##args)
+#endif
 
 #endif
diff --git a/include/math.h b/include/math.h
index 8759c28..2a69430 100644
--- a/include/math.h
+++ b/include/math.h
@@ -5,4 +5,27 @@
 /* Now define the internal interfaces.  */
 extern int __matherr (struct exception *__exc);
 
+extern int __finite_internal (double __value)
+     __attribute__ ((__const__)) attribute_hidden;
+extern int __finitef_internal (float __value)
+     __attribute__ ((__const__)) attribute_hidden;
+extern int __finitel_internal (long double __value)
+     __attribute__ ((__const__)) attribute_hidden;
+
+#if !defined NOT_IN_libc || defined IS_IN_libm
+# undef isfinite
+# ifdef __NO_LONG_DOUBLE_MATH
+#  define isfinite(x) \
+     (sizeof (x) == (sizeof (float)					      \
+		     ? INTUSE(__finitef) (x) : INTUSE(__finite) (x)))
+# else
+#  define isfinite(x) \
+     (sizeof (x) == sizeof (float)					      \
+      ? INTUSE(__finitef) (x)						      \
+      : sizeof (x) == sizeof (double)					      \
+      ? INTUSE(__finite) (x) : INTUSE(__finitel) (x))
+# endif
+#endif
+
+
 #endif
diff --git a/include/mntent.h b/include/mntent.h
index 7035630..421f1df 100644
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -3,11 +3,25 @@
 
 /* Now define the internal interfaces.  */
 extern FILE *__setmntent (__const char *__file, __const char *__mode);
+extern FILE *__setmntent_internal (__const char *__file, __const char *__mode);
 extern struct mntent *__getmntent_r (FILE *__stream,
 				     struct mntent *__result,
 				     char *__buffer, int __bufsize);
+extern struct mntent *__getmntent_r_internal (FILE *__stream,
+					      struct mntent *__result,
+					      char *__buffer, int __bufsize)
+     attribute_hidden;
 extern int __addmntent (FILE *__stream, __const struct mntent *__mnt);
 extern int __endmntent (FILE *__stream);
+extern int __endmntent_internal (FILE *__stream) attribute_hidden;
 extern char *__hasmntopt (__const struct mntent *__mnt,
 			  __const char *__opt);
+
+#ifndef NOT_IN_libc
+# define __setmntent(file, mode) INTUSE(__setmntent) (file, mode)
+# define __endmntent(stream) INTUSE(__endmntent) (stream)
+# define __getmntent_r(stream, result, buffer, bufsize) \
+  INTUSE(__getmntent_r) (stream, result, buffer, bufsize)
+#endif
+
 #endif
diff --git a/include/stdio.h b/include/stdio.h
index a72d1d7..0eddd7d 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -77,6 +77,14 @@ extern wint_t __getwc_unlocked (FILE *__fp);
 extern __const char *__const _sys_errlist_internal[] attribute_hidden;
 extern int _sys_nerr_internal attribute_hidden;
 
+extern int __asprintf_internal (char **__restrict __ptr,
+				__const char *__restrict __fmt, ...)
+     attribute_hidden __attribute__ ((__format__ (__printf__, 2, 3)));
+#  ifndef NOT_IN_libc
+#    define __asprintf(ptr, fmt, args...) \
+  INTUSE(__asprintf) (ptr, fmt, ##args)
+#  endif
+
 # endif
 
 #endif
diff --git a/include/stdio_ext.h b/include/stdio_ext.h
index 09db6f2..31c7a4e 100644
--- a/include/stdio_ext.h
+++ b/include/stdio_ext.h
@@ -2,4 +2,10 @@
 
 # include <stdio-common/stdio_ext.h>
 
+extern int __fsetlocking_internal (FILE *__fp, int __type) attribute_hidden;
+
+#ifndef NOT_IN_libc
+# define __fsetlocking(fp, type) INTUSE(__fsetlocking) (fp, type)
+#endif
+
 #endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 110a78c..f4e6d30 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -60,6 +60,8 @@ extern void _quicksort (void *const pbase, size_t total_elems,
 extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);
 
 extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
+extern int __cxa_atexit_internal (void (*func) (void *), void *arg, void *d)
+     attribute_hidden;
 
 extern void __cxa_finalize (void *d);
 
@@ -150,6 +152,8 @@ __strtoull_l (__const char * __restrict __nptr, char **__restrict __endptr,
 # ifndef NOT_IN_libc
 #  undef MB_CUR_MAX
 #  define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
+
+# define __cxa_atexit(func, arg, d) INTUSE(__cxa_atexit) (func, arg, d)
 # endif
 
 #endif
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 4ae7108..c09eac4 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -27,6 +27,8 @@ extern ssize_t __send (int __fd, __const void *__buf, size_t __n, int __flags);
    and the only address from which to accept transmissions.
    Return 0 on success, -1 for errors.  */
 extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
+extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
+			       socklen_t __len) attribute_hidden;
 
 /* Return the length of a `sockaddr' structure.  */
 #ifdef _HAVE_SA_LEN
@@ -36,4 +38,9 @@ extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
 extern int __libc_sa_len (sa_family_t __af) __THROW;
 #endif
 
+
+#ifndef NOT_IN_libc
+# define __connect(fd, addr, len) INTUSE(__connect) (fd, addr, len)
+#endif
+
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 5cd4360..f2d31a1 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -51,6 +51,7 @@ char *__canonicalize_directory_name_internal (__const char *__thisdir,
 
 extern int __dup (int __fd);
 extern int __dup2 (int __fd, int __fd2);
+extern int __dup2_internal (int __fd, int __fd2) attribute_hidden;
 extern int __execve (__const char *__path, char *__const __argv[],
 		     char *__const __envp[]);
 extern long int __pathconf (__const char *__path, int __name);
@@ -83,9 +84,11 @@ extern int __profil (unsigned short int *__sample_buffer, size_t __size,
 extern int __getdtablesize (void);
 extern int __brk (void *__addr);
 extern int __close (int __fd);
+extern int __close_internal (int __fd) attribute_hidden;
 extern ssize_t __read (int __fd, void *__buf, size_t __nbytes);
 extern ssize_t __write (int __fd, __const void *__buf, size_t __n);
 extern __pid_t __fork (void);
+extern __pid_t __fork_internal (void) attribute_hidden;
 extern int __getpagesize (void) __attribute__ ((__const__));
 extern int __ftruncate (int __fd, __off_t __length);
 extern int __ftruncate64 (int __fd, __off64_t __length);
@@ -108,4 +111,10 @@ extern int __libc_enable_secure_internal attribute_hidden;
 extern void __libc_check_standard_fds (void);
 
 
+#ifndef NOT_IN_libc
+# define __close(fd) INTUSE(__close) (fd)
+# define __dup2(fd, fd2) INTUSE(__dup2) (fd, fd2)
+# define __fork() INTUSE(__fork) ()
+#endif
+
 #endif