update from main archive 961214

Sun Dec 15 01:53:20 1996 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Change crypt to md5-crypt. * crypt/Makefile, crypt/md5-crypt.c, crypt/md5.c, crypt/md5.h, crypt/md5c-test.c, crypt/md5test.c: Move to new directory md5-crypt. * sysdeps/unix/sysv/linux/configure.in: Refer to linuxthreads and crypt instead of LinuxThreads and des-crypt. * Makefile (subdirs): Add nss back. * sysdeps/unix/inet/Subdirs: Move nis to end of file to fulfill dependencies. * libio/iofclose.c: Implement fclose(NULL) as closing all streams. * stdio-common/Makefile (routines): Add fcloseall. * stdio-common/fcloseall.c: New file. * sysdeps/generic/abort.c: Make implementation POSIX.1 compatible. * sysdeps/mach/libc-lock.h: Add definition of __libc_lock_trylock. * sysdeps/stub/libc-lock.h: Define __libc_lock_trylock to always return 0. * stdio-common/printf.h: Define MIN and MAX only if not already defined. * stdio-common/vfprintf.c: Set errno to EBADF if stream does not allow writing. Required by POSIX.1. * libio/libioP.h (CHECK_FILE): Use MAYBE_SET_EINVAL instead of assignment. * interp.c: Update copyright. * libio/clearerr.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * stdio/fclose.c: Likewise. * stdio/fflus.c: Likewise. * libio/libio.h [!_IO_MTSAFE_IO]: Define _IO_cleanup_region_start and _IO_cleanup_region_end as empty. * libio/fgetc.c: Use _IO_cleanup_region_start and _IO_cleanup_region_end instead of __libc_cleanup_region_start and __libc_cleanup_region_end. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovspintf.c: Use cleanup handler to make sure no dangling locks can stay over. * libio/iovsscanf.c: Likewise. * libio/genops.c: Use _IO_lock_init_recursive and _IO_lock_fini instead of __libc_lock_init_recursive and __libc_lock_fini. * libio/filedoalloc.c: Only use __isatty when compiling GNU libc. Otherwise use isatty. * libio/fileops.c: Likewise for __open and open. * login/utmp_file.c (getutent_r_file): Use fcntl instead of flock. * nis/ypclnt.h: Add more casts to prevent warnings. * nss/Makefile (services): Remove dns. (libnss_dns, libnss_dns-inhibit-o): Remove definition. ($(objpfx)libnss_dns.so): Removed. * nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Moved to... * resolv/nss_dns: ...here. * resolv/Makefile (extra-libs): Add libnss_dns. (libnss_dns-routines, libnss_dns-inhibit-o): Define as in nss/Makefile. * nss/XXX-lookup.c: Call __nss_database_lookup with new argument specifying alternate name for entry in /etc/nsswitch.conf * nss/nsswitch.c: If no entry with primary name is found in /etc/nsswitch.conf try alternate name if given. * nss/nsswitch.h: Add new parameter in prototype for __nss_database_lookup. * nss/spwd-lookup.c: Provide alternative entry name to look for. This makes our NSS compatible with Solaris' nsswitch.conf files. * string/tst-strlen.c: Change all counting variables to type size_t to prevent warnings. * sysdeps/posix/fpathconf.c: Update copyright. * sysdeps/posix/pathconf.c: Don't call fpathconf to do the work. Opening the file at this path may fail if it is a FIFO or pipe. These changes make the time implementation POSIX.1 compliant. * time/localtime.c (__localtime_r): Always call __tzset not only if __tzset_run is zero. * time/strftime.c: Add definition of memset_space to help to reduce for systems which have memset. (strftime): Don't use tm_zone member of argument for zone name. Instead always use tzname[]. Call tzset() as required by POSIX.1 before any action. * time/tzset.c (tzset): Set tzname[] as required by POSIX.1. Remove global variable __tzset_run. __tzset is now called always when a dependent function is used. (__tzset): Caching happens based on the contents of the environment variable TZ. Fri Dec 13 01:06:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/paths.h: Add _PATH_KLOG. Thu Dec 12 09:16:35 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * rellns-sh: Correctly handle a relative source file name. Wed Dec 11 19:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/utmp_file.c (setutent_file): Seek back to beginning of the file if resetting. Thu Dec 12 16:39:12 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/hurdinit.c (map0): Delete function. Don't do this on _hurd_preinit_hook. * hurd/hurdstartup.c (_hurd_startup): Map page zero redzone here.
git-mirror · Dec 15, 1996 · 68dbb3a · 68dbb3a
1 parent f8b87ef
commit 68dbb3a
Show file tree

Hide file tree

Showing 74 changed files with 1,724 additions and 349 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,141 @@
+Sun Dec 15 01:53:20 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile (subdirs): Change crypt to md5-crypt.
+	* crypt/Makefile, crypt/md5-crypt.c, crypt/md5.c, crypt/md5.h,
+	crypt/md5c-test.c, crypt/md5test.c: Move to new directory
+	md5-crypt.
+	* sysdeps/unix/sysv/linux/configure.in: Refer to linuxthreads and
+	crypt instead of LinuxThreads and des-crypt.
+
+	* Makefile (subdirs): Add nss back.
+	* sysdeps/unix/inet/Subdirs: Move nis to end of file to fulfill
+	dependencies.
+
+	* libio/iofclose.c: Implement fclose(NULL) as closing all streams.
+	* stdio-common/Makefile (routines): Add fcloseall.
+	* stdio-common/fcloseall.c: New file.
+	* sysdeps/generic/abort.c: Make implementation POSIX.1 compatible.
+
+	* sysdeps/mach/libc-lock.h: Add definition of __libc_lock_trylock.
+	* sysdeps/stub/libc-lock.h: Define __libc_lock_trylock to always
+	return 0.
+
+	* stdio-common/printf.h: Define MIN and MAX only if not already
+	defined.
+
+	* stdio-common/vfprintf.c: Set errno to EBADF if stream does not
+	allow writing.  Required by POSIX.1.
+
+	* libio/libioP.h (CHECK_FILE): Use MAYBE_SET_EINVAL instead of
+	assignment.
+
+	* interp.c: Update copyright.
+	* libio/clearerr.c: Likewise.
+	* libio/ioseekoff.c: Likewise.
+	* libio/ioseekpos.c: Likewise.
+	* stdio/fclose.c: Likewise.
+	* stdio/fflus.c: Likewise.
+
+	* libio/libio.h [!_IO_MTSAFE_IO]: Define _IO_cleanup_region_start
+	and _IO_cleanup_region_end as empty.
+	* libio/fgetc.c: Use _IO_cleanup_region_start and
+	_IO_cleanup_region_end instead of __libc_cleanup_region_start and
+	__libc_cleanup_region_end.
+	* libio/fputc.c: Likewise.
+	* libio/freopen.c: Likewise.
+	* libio/fseek.c: Likewise.
+	* libio/getc.c: Likewise.
+	* libio/getchar.c: Likewise.
+	* libio/iofclose.c: Likewise.
+	* libio/iofflush.c: Likewise.
+	* libio/iofgetpos.c: Likewise.
+	* libio/iofgets.c: Likewise.
+	* libio/iofputs.c: Likewise.
+	* libio/iofread.c: Likewise.
+	* libio/iofsetpos.c: Likewise.
+	* libio/ioftell.c: Likewise.
+	* libio/iofwrite.c: Likewise.
+	* libio/iogetdelim.c: Likewise.
+	* libio/iogets.c: Likewise.
+	* libio/ioputs.c: Likewise.
+	* libio/iosetbuffer.c: Likewise.
+	* libio/iosetvbuf.c: Likewise.
+	* libio/ioungetc.c: Likewise.
+
+	* libio/iovspintf.c: Use cleanup handler to make sure no dangling
+	locks can stay over.
+	* libio/iovsscanf.c: Likewise.
+
+	* libio/genops.c: Use _IO_lock_init_recursive and _IO_lock_fini
+	instead of __libc_lock_init_recursive and __libc_lock_fini.
+
+	* libio/filedoalloc.c: Only use __isatty when compiling GNU libc.
+	Otherwise use isatty.
+	* libio/fileops.c: Likewise for __open and open.
+
+	* login/utmp_file.c (getutent_r_file): Use fcntl instead of
+	flock.
+
+	* nis/ypclnt.h: Add more casts to prevent warnings.
+
+	* nss/Makefile (services): Remove dns.
+	(libnss_dns, libnss_dns-inhibit-o): Remove definition.
+	($(objpfx)libnss_dns.so): Removed.
+	* nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Moved to...
+	* resolv/nss_dns: ...here.
+	* resolv/Makefile (extra-libs): Add libnss_dns.
+	(libnss_dns-routines, libnss_dns-inhibit-o): Define as in
+	nss/Makefile.
+
+	* nss/XXX-lookup.c: Call __nss_database_lookup with new argument
+	specifying alternate name for entry in /etc/nsswitch.conf
+	* nss/nsswitch.c: If no entry with primary name is found in
+	/etc/nsswitch.conf try alternate name if given.
+	* nss/nsswitch.h: Add new parameter in prototype for
+	__nss_database_lookup.
+	* nss/spwd-lookup.c: Provide alternative entry name to look for.
+	This makes our NSS compatible with Solaris' nsswitch.conf files.
+
+	* string/tst-strlen.c: Change all counting variables to type size_t
+	to prevent warnings.
+
+	* sysdeps/posix/fpathconf.c: Update copyright.
+	* sysdeps/posix/pathconf.c: Don't call fpathconf to do the work.
+	Opening the file at this path may fail if it is a FIFO or pipe.
+
+	These changes make the time implementation POSIX.1 compliant.
+	* time/localtime.c (__localtime_r): Always call __tzset not only
+	if __tzset_run is zero.
+	* time/strftime.c: Add definition of memset_space to help to
+	reduce for systems which have memset.
+	(strftime): Don't use tm_zone member of argument for zone name.
+	Instead always use tzname[].
+	Call tzset() as required by POSIX.1 before any action.
+	* time/tzset.c (tzset): Set tzname[] as required by POSIX.1.
+	Remove global variable __tzset_run.  __tzset is now called always
+	when a dependent function is used.
+	(__tzset): Caching happens based on the contents of the
+	environment variable TZ.
+
+Fri Dec 13 01:06:52 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/paths.h: Add _PATH_KLOG.
+
+Thu Dec 12 09:16:35 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* rellns-sh: Correctly handle a relative source file name.
+
+Wed Dec 11 19:18:40 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* login/utmp_file.c (setutent_file): Seek back to beginning of the
+	file if resetting.
+
+Thu Dec 12 16:39:12 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* hurd/hurdinit.c (map0): Delete function.  Don't do this on
+	_hurd_preinit_hook.
+	* hurd/hurdstartup.c (_hurd_startup): Map page zero redzone here.
+
 Thu Dec 12 03:32:21 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t,

diff --git a/FAQ b/FAQ
@@ -71,6 +71,9 @@ please let me know.
 
 [Q19]	``My XXX kernel emulates a floating-point coprocessor for me.
 	  Should I enable --with-fp?''
+
+[Q20]	``How can I compile gcc 2.7.2.1 from the gcc source code using
+	  glibc 2.x?
 
 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 [Q1]	``What systems does the GNU C Library run on?''
@@ -422,7 +425,7 @@ the package and tell the configuration script about these additional
 subdirectories using the --enable-add-ons option.  When you add the
 crypt add-on you just have to use
 
-	configure --enable-add-ons=des-crypt,XXX ...
+	configure --enable-add-ons=crypt,XXX ...
 
 where XXX are possible other add-ons and ... means the rest of the
 normal option list.
@@ -473,7 +476,7 @@ use it instead of the old libc.  In this case the needed startup files
 and libraries are not found in the regular places.  So the specs file
 must tell the compiler and linker exactly what to use.  Here is for
 example the gcc-2.7.2 specs file when GNU libc is installed at
-/home/gnu:
+/usr:
 
 -----------------------------------------------------------------------
 *asm:
@@ -483,28 +486,28 @@ example the gcc-2.7.2 specs file when GNU libc is installed at
 %{pipe:-}
 
 *cpp:
-%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE} -I/home/gnu/include
+%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}
 
 *cc1:
-
+%{profile:-p}
 
 *cc1plus:
 
 
 *endfile:
-%{!shared:crtend.o%s} %{shared:crtendS.o%s} /home/gnu/lib/crtn.o%s
+%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s
 
 *link:
--m elf_i386 -rpath=/home/gnu/lib -L/home/gnu/lib %{shared:-shared}   %{!shared:     %{!ibcs:       %{!static: 	%{rdynamic:-export-dynamic} 	%{!dynamic-linker:-dynamic-linker=/home/gnu/lib/ld.so.1}} 	%{static:-static}}}
+-m elf_i386 %{shared:-shared}   %{!shared:     %{!ibcs:       %{!static: 	%{rdynamic:-export-dynamic} 	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} 	%{static:-static}}}
 
 *lib:
-%{!shared: %{mieee-fp:-lieee} %{p:-lc_p} %{!p:%{pg:-lc_p} %{!pg:-lc}}}
+%{!shared: %{pthread:-lpthread} 	%{profile:-lc_p} %{!profile: -lc}}
 
 *libgcc:
-%{!shared:-lgcc}
+-lgcc
 
 *startfile:
-%{!shared: %{pg:/home/gnu/lib/gcrt1.o%s} %{!pg:%{p:/home/gnu/lib/gcrt1.o} %{!p:/home/gnu/lib/crt1.o%s}}} /home/gnu/lib/crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}
+%{!shared:      %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} 		       %{!p:%{profile:gcrt1.o%s} 			 %{!profile:crt1.o%s}}}}    crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}
 
 *switches_need_spaces:
 
@@ -523,15 +526,15 @@ example the gcc-2.7.2 specs file when GNU libc is installed at
 
 -----------------------------------------------------------------------
 
-The above is currently correct for all systems but ix86/Linux.
-Because of compatibility issues on this platform the dynamic linker
-must have a different name: ld-linux.so.2.  So you have to replace
+The above is currently correct for ix86/Linux.  Because of
+compatibility issues on this platform the dynamic linker must have
+a different name: ld-linux.so.2.  So you have to replace
 
-	%{!dynamic-linker:-dynamic-linker=/home/gnu/lib/ld.so.1}
-by
 	%{!dynamic-linker:-dynamic-linker=/home/gnu/lib/ld-linux.so.2}
+by
+	%{!dynamic-linker:-dynamic-linker=/home/gnu/lib/ld.so.1}
 
-in the above example specs file.
+in the above example specs file ti make it work for other systems.
 
 Future versions of GCC will automatically provide the correct specs.
 
@@ -582,12 +585,27 @@ this should not be changed unless the FPU instructions would be
 invalid.  I.e., an emulated FPU is for the libc as good as a real one.
 
 
+~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+[Q20]	``How can I compile gcc 2.7.2.1 from the gcc source code using
+	  glibc 2.x?
+
+[A20] {HJL} There is no support in gcc for glibc 2.0 before gcc 2.8. It
+is very tricky to compile gcc 2.7.2.1 using glibc 2.x. You have to
+build it manually or with one pass only. You also have to use the
+specs file in this FAQ while compiling gcc.
+
+A pre-compiled binary version of gcc 2.7.2.1 linked with glibc 2.x for
+Linux/x86 is available in the same directory at the glibc 2.x source
+code ftp sites.
+
+
 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 Answers were given by:
 {UD} Ulrich Drepper, <drepper@cygnus.com>
 {DMT} David Mosberger-Tang, <davidm@AZStarNet.com>
 {RM} Roland McGrath, <roland@gnu.ai.mit.edu>
+{HJL} H.J. Lu, <hjl@gnu.ai.mit.edu>
 
 Local Variables:
  mode:text

diff --git a/Makefile b/Makefile
@@ -54,7 +54,8 @@ endif
 subdirs = csu assert ctype db locale intl catgets math setjmp signal stdlib \
 	  stdio-common $(stdio) $(malloc) string wcsmbs time dirent grp pwd \
 	  posix io termios resource misc login socket sysvipc gmon gnulib \
-	  wctype manual shadow crypt $(sysdep-subdirs) nss elf po $(add-ons)
+	  wctype manual shadow md5-crypt nss $(sysdep-subdirs) elf po \
+	  $(add-ons)
 export subdirs := $(subdirs)	# Benign, useless in GNU make before 3.63.
 
 # The mach and hurd subdirectories have many generated header files which

diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c
@@ -203,23 +203,3 @@ _hurd_setproc (process_t procserver)
 
   return 0;
 }
-
-/* Map the page at address zero with no access allowed, so
-   dereferencing NULL will fault and no "anywhere" allocations
-   (e.g. the out of line memory containing the argument strings)
-   can be assigned address zero, which C says is not a valid pointer.
-
-   When dynamically linked, this should be done by the dynamic linker
-   before we run, but failing is harmless and we ignore the error.  */
-
-static void map0 (void) __attribute__ ((unused));
-text_set_element (_hurd_preinit_hook, map0);
-
-static void
-map0 (void)
-{
-  vm_address_t addr = 0;
-  __vm_map (__mach_task_self (),
-	    &addr, __vm_page_size, 0, 0, MACH_PORT_NULL, 0, 1,
-	    VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
-}
diff --git a/hurd/hurdstartup.c b/hurd/hurdstartup.c
@@ -75,6 +75,14 @@ _hurd_startup (void **argptr, void (*main) (int *data))
   char **argv, **envp;
   int argc, envc;
   int *argcptr;
+  vm_address_t addr;
+
+  /* Attempt to map page zero redzoned before we receive any RPC
+     data that might get allocated there.  We can ignore errors.  */
+  addr = 0;
+  __vm_map (__mach_task_self (),
+	    &addr, __vm_page_size, 0, 0, MACH_PORT_NULL, 0, 1,
+	    VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
 
   if (err = __task_get_special_port (__mach_task_self (), TASK_BOOTSTRAP_PORT,
 				     &in_bootstrap))

diff --git a/interp.c b/interp.c
@@ -1,21 +1,21 @@
 /* interp - add information about dynamic loader to shared libray obejcts.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
   = RUNTIME_LINKER;
diff --git a/libio/clearerr.c b/libio/clearerr.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "libioP.h"
 #include "stdio.h"

diff --git a/libio/fgetc.c b/libio/fgetc.c
@@ -31,9 +31,9 @@ fgetc (fp)
 {
   int result;
   CHECK_FILE (fp, EOF);
-  __libc_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+  _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
   _IO_flockfile (fp);
   result = _IO_getc_unlocked (fp);
-  __libc_cleanup_region_end (1);
+  _IO_cleanup_region_end (1);
   return result;
 }