11 files changed, 121 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 496ad4d59c..67d19456fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+1998-06-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/generic/elf/backtracesyms.c: Make array elements
+	constant.
+	* sysdeps/generic/backtracesyms.c: Likewise.  Fix type of RESULT.
+	* debug/execinfo.h: Update declaration.
+
+1998-06-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/generic/elf/backtracesyms.c: Make array elements constant.
+	* sysdeps/generic/backtracesyms.c: Likewise.  Fix type of RESULT.
+	* debug/execinfo.h: Update declaration.
+
+1998-06-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* manual/llio.texi: Fix spelling.
+	* manual/sysinfo.texi: Fix spelling.
+
+1998-06-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* misc/hsearch.c (__hdestroy): Renamed from hdestroy, create weak
+	alias for old name.  Put this on __libc_subfreeres.
+	* misc/search.h: Declare it.
+
+1998-06-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* string/bits/string2.h (strcmp): Add missing parens around macro
+	parameters.
+
 1998-06-12 23:34  Ulrich Drepper  <drepper@cygnus.com>
 
 	* manual/arith.texi: Fix problem with @math and texinfo.tex.
diff --git a/debug/execinfo.h b/debug/execinfo.h
index 07bed92446..bf757edf77 100644
--- a/debug/execinfo.h
+++ b/debug/execinfo.h
@@ -31,8 +31,8 @@ extern int backtrace __P ((void **__array, int __size));
 
 /* Return names of functions from the backtrace list in ARRAY in a newly
    malloc()ed memory block.  */
-extern char **__backtrace_symbols __P ((__const void **__array, int __size));
-extern char **backtrace_symbols __P ((__const void **__array, int __size));
+extern char **__backtrace_symbols __P ((void *__const *__array, int __size));
+extern char **backtrace_symbols __P ((void *__const *__array, int __size));
 
 __END_DECLS
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 253c3cdf6f..70b4ea733c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+1998-06-14  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* locales/sk_SK: Add repertoiremap.
+
 1998-05-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
 	* locales/ru_SU: Add repertoiremap.
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 7e68ccd106..8d5dd734c9 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -1,8 +1,9 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 %
 % Slovak Language Locale for Slovak
-% Source: 
+% Source:
 % Address: Narcisov<a'> 56, SK-821 01 Bratislava, Slovak Republic
 % Contact: Stanislav Meduna
 % Email:   stano@eunet.sk
@@ -18,7 +19,7 @@ comment_char %
 % Charset: ISO-8859-2
 % Distribution and use is free, also for commercial purposes.
 
-% 1997-05-14: Odvodené z cs_CZ locale Vladimíra Michla. 
+% 1997-05-14: Odvodené z cs_CZ locale Vladimíra Michla.
 %             Collate algoritmy prevzaté bezo zmien (norma bola rovnaká),
 %             vysvetlenie pozri cs_CZ
 
@@ -46,7 +47,7 @@ END LC_COLLATE
 %% ekvivalenty yes/no
 %% -------------------------
 
-LC_MESSAGES 
+LC_MESSAGES
 
 yesexpr		"<<(><a><A><a'><A'><y><Y><)/>><.><*>"
 noexpr  	"<<(><n><N><)/>><.><*>"
diff --git a/manual/llio.texi b/manual/llio.texi
index 6180a060fb..e0b16716ab 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -166,9 +166,6 @@ which can be used to access the file named by @var{filename}.  The only
 the difference is that on 32 bits systems the file is opened in the
 large file mode.  I.e., file length and file offsets can exceed 31 bits.
 
-To use this file descriptor one must not use the normal operations but
-instead the counterparts named @code{*64}, e.g., @code{read64}.
-
 When the sources are translated with @code{_FILE_OFFSET_BITS == 64} this
 function is actually available under the name @code{open}.  I.e., the
 new, extended API using 64 bit file sizes and offsets transparently
@@ -300,7 +297,7 @@ by the user to perform this operation.
 When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} the
 @code{truncate} function is in fact @code{truncate64} and the type
 @code{off_t} has 64 bits which makes it possible to handle files up to
-@math{2^63} bytes.
+@math{2^63} bytes in length.
 
 The return value is zero is everything went ok.  Otherwise the return
 value is @math{-1} and the global variable @var{errno} is set to:
@@ -326,11 +323,11 @@ it is only of marginally additional utility.  See below.
 @comment Unix98
 @deftypefun int truncate64 (const char *@var{name}, off64_t @var{length})
 This function is similar to the @code{truncate} function.  The
-difference is that the @var{length} argument is even on 32 bits machines
-64 bits wide which allows to handle file with a size up to @math{2^63}
+difference is that the @var{length} argument is 64 bits wide even on 32
+bits machines which allows to handle file with a size up to @math{2^63}
 bytes.
 
-When the sources are defined using @code{_FILE_OFFSET_BITS == 64} on a
+When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} on a
 32 bits machine this function is actually available under the name
 @code{truncate} and so transparently replaces the 32 bits interface.
 @end deftypefun
@@ -355,7 +352,7 @@ memory segments if these are implemented by the system.
 When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} the
 @code{ftruncate} function is in fact @code{ftruncate64} and the type
 @code{off_t} has 64 bits which makes it possible to handle files up to
-@math{2^63} bytes.
+@math{2^63} bytes in length.
 
 On success the function returns zero.  Otherwise it returns @math{-1}
 and set @var{errno} to one of these values:
@@ -373,11 +370,11 @@ The file is on a read-only file system.
 @comment Unix98
 @deftypefun int ftruncate64 (int @var{id}, off64_t @var{length})
 This function is similar to the @code{ftruncate} function.  The
-difference is that the @var{length} argument is even on 32 bits machines
-64 bits wide which allows to handle file with a size up to @math{2^63}
+difference is that the @var{length} argument is 64 bits wide even on 32
+bits machines which allows to handle file with a size up to @math{2^63}
 bytes.
 
-When the sources are defined using @code{_FILE_OFFSET_BITS == 64} on a
+When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} on a
 32 bits machine this function is actually available under the name
 @code{ftruncate} and so transparently replaces the 32 bits interface.
 @end deftypefun
@@ -506,7 +503,7 @@ not effected by the operation.  The value is the same as before the call.
 When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} the
 @code{pread} function is in fact @code{pread64} and the type
 @code{off_t} has 64 bits which makes it possible to handle files up to
-@math{2^63} bytes.
+@math{2^63} bytes in length.
 
 The return value of @code{pread} describes the number of bytes read.
 In the error case it returns @math{-1} like @code{read} does and the
@@ -530,12 +527,12 @@ version 2.
 This function is similar to the @code{pread} function.  The difference
 is that the @var{offset} parameter is of type @code{off64_t} instead of
 @code{off_t} which makes it possible on 32 bits machines to address
-files larger then @math{2^31} bytes and up to @math{2^63} bytes.  The
+files larger than @math{2^31} bytes and up to @math{2^63} bytes.  The
 file descriptor @code{filedes} must be opened using @code{open64} since
 otherwise the large offsets possible with @code{off64_t} will lead to
 errors with a descriptor in small file mode.
 
-When the sources are defined using @code{_FILE_OFFSET_BITS == 64} on a
+When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} on a
 32 bits machine this function is actually available under the name
 @code{pread} and so transparently replaces the 32 bits interface.
 @end deftypefun
@@ -662,7 +659,7 @@ not effected by the operation.  The value is the same as before the call.
 When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} the
 @code{pwrite} function is in fact @code{pwrite64} and the type
 @code{off_t} has 64 bits which makes it possible to handle files up to
-@math{2^63} bytes.
+@math{2^63} bytes in length.
 
 The return value of @code{pwrite} describes the number of written bytes.
 In the error case it returns @math{-1} like @code{write} does and the
@@ -686,12 +683,12 @@ version 2.
 This function is similar to the @code{pwrite} function.  The difference
 is that the @var{offset} parameter is of type @code{off64_t} instead of
 @code{off_t} which makes it possible on 32 bits machines to address
-files larger then @math{2^31} bytes and up to @math{2^63} bytes.  The
+files larger than @math{2^31} bytes and up to @math{2^63} bytes.  The
 file descriptor @code{filedes} must be opened using @code{open64} since
 otherwise the large offsets possible with @code{off64_t} will lead to
 errors with a descriptor in small file mode.
 
-When the sources are defined using @code{_FILE_OFFSET_BITS == 64} on a
+When the source file is compiled using @code{_FILE_OFFSET_BITS == 64} on a
 32 bits machine this function is actually available under the name
 @code{pwrite} and so transparently replaces the 32 bits interface.
 @end deftypefun
@@ -784,7 +781,7 @@ only for pipes and FIFOs, but in the GNU system, you always get
 When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} the
 @code{lseek} function is in fact @code{lseek64} and the type
 @code{off_t} has 64 bits which makes it possible to handle files up to
-@math{2^63} bytes.
+@math{2^63} bytes in length.
 
 This function is a cancelation point in multi-threaded programs.  This
 is a problem if the thread allocates some resources (like memory, file
@@ -806,12 +803,12 @@ descriptors.
 This function is similar to the @code{lseek} function.  The difference
 is that the @var{offset} parameter is of type @code{off64_t} instead of
 @code{off_t} which makes it possible on 32 bits machines to address
-files larger then @math{2^31} bytes and up to @math{2^63} bytes.  The
+files larger than @math{2^31} bytes and up to @math{2^63} bytes.  The
 file descriptor @code{filedes} must be opened using @code{open64} since
 otherwise the large offsets possible with @code{off64_t} will lead to
 errors with a descriptor in small file mode.
 
-When the sources are defined using @code{_FILE_OFFSET_BITS == 64} on a
+When the source file is compiled with @code{_FILE_OFFSET_BITS == 64} on a
 32 bits machine this function is actually available under the name
 @code{lseek} and so transparently replaces the 32 bits interface.
 @end deftypefun
@@ -877,7 +874,7 @@ is transparently replaced by @code{off64_t}.
 @comment Unix98
 @deftp {Data Type} off64_t
 This type is used similar to @code{off_t}.  The difference is that even
-on 32 bits machines, where the @code{off_t} type would 32 bits,
+on 32 bits machines, where the @code{off_t} type would have 32 bits,
 @code{off64_t} has 64 bits and so is able to address files up to
 @math{2^63} bytes in length.
 
@@ -1396,18 +1393,18 @@ No synchronization is possible since the system does not implement this.
 The POSIX.1b standard defines a new set of I/O operations which can
 reduce the time an application spends waiting at I/O significantly.  The
 new functions allow a program to initiate one or more I/O operations and
-then immediately resume the normal word while the I/O operations are
+then immediately resume the normal work while the I/O operations are
 executed in parallel.  The functionality is available if the
 @file{unistd.h} file defines the symbol @code{_POSIX_ASYNCHRONOUS_IO}.
 
 These functions are part of the library with realtime functions named
 @file{librt}.  They are not actually part of the @file{libc} binary.
 The implementation of these functions can be done using support in the
-kernel )if available) or using a implementation based on threads at
-userlevel.  In the later case it might be necessary to link applications
-linked with @file{librt} also with the thread library @file{libthread}.
+kernel (if available) or using an implementation based on threads at
+userlevel.  In the latter case it might be necessary to link applications
+with the thread library @file{libthread} in addition to @file{librt}.
 
-All AIO operations operate on files which previously were opened.  There
+All AIO operations operate on files which were opened previously.  There
 might be arbitrary many operations for one file running.  The
 asynchronous I/O operations are controlled using a data structure named
 @code{struct aiocb} (@dfn{AIO control block}).  It is defined in
@@ -1440,14 +1437,14 @@ descriptor.
 
 @item volatile void *aio_buf
 This is a pointer to the buffer with the data to be written or the place
-where the ead data is stored.
+where the read data is stored.
 
 @item size_t aio_nbytes
 This element specifies the length of the buffer pointed to by @code{aio_buf}.
 
 @item int aio_reqprio
-If for the platform @code{_POSIX_PRIORITIZED_IO} and
-@code{_POSIX_PRIORITY_SCHEDULING} is defined the AIO requests are
+If the platform has defined @code{_POSIX_PRIORITIZED_IO} and
+@code{_POSIX_PRIORITY_SCHEDULING} the AIO requests are
 processed based on the current scheduling priority.  The
 @code{aio_reqprio} element can then be used to lower the priority of the
 AIO operation.
@@ -1458,13 +1455,13 @@ operation terminated.  If the @code{sigev_notify} element is
 @code{SIGEV_NONE} no notification is send.  If it is @code{SIGEV_SIGNAL}
 the signal determined by @code{sigev_signo} is send.  Otherwise
 @code{sigev_notify} must be @code{SIGEV_THREAD} in which case a thread
-which starts executing the function pointeed to by
+is created which starts executing the function pointed to by
 @code{sigev_notify_function}.
 
 @item int aio_lio_opcode
 This element is only used by the @code{lio_listio} and
-@code{[lio_listio64} functions.  Since these functions allow to start an
-arbitrary number of operations at once and since each operationcan be
+@code{lio_listio64} functions.  Since these functions allow to start an
+arbitrary number of operations at once and since each operation can be
 input or output (or nothing) the information must be stored in the
 control block.  The possible values are:
 
@@ -1568,14 +1565,13 @@ aiocb64} since the LFS replaces transparently the old interface.
 @comment POSIX.1b
 @deftypefun int aio_read (struct aiocb *@var{aiocbp})
 This function initiates an asynchronous read operation.  The function
-call immediately returns after the operation was enqueued or if before
-this happens an error was encoutered.
+call immediately returns after the operation was enqueued or when an
+error was encoutered.
 
 The first @code{aiocbp->aio_nbytes} bytes of the file for which
-@code{aiocbp->aio_fildes} is an descriptor are written to the buffer
-starting at @code{aiocbp->aio_buf}.  @code{aiocbp->aio_fildes} is an
-descriptor.  Reading starts at the absolute position
-@code{aiocbp->aio_offset} in the file.
+@code{aiocbp->aio_fildes} is a descriptor are written to the buffer
+starting at @code{aiocbp->aio_buf}.  Reading starts at the absolute
+position @code{aiocbp->aio_offset} in the file.
 
 If prioritized I/O is supported by the platform the
 @code{aiocbp->aio_reqprio} value is used to adjust the priority before
@@ -1607,7 +1603,7 @@ request and so this error might also be signaled asynchrously.
 
 In the case @code{aio_read} returns zero the current status of the
 request can be queried using @code{aio_error} and @code{aio_return}
-questions.  As long as the value returned by @code{aio_error} is
+functions.  As long as the value returned by @code{aio_error} is
 @code{EINPROGRESS} the operation has not yet completed.  If
 @code{aio_error} returns zero the operation successfully terminated,
 otherwise the value is to be interpreted as an error code.  If the
@@ -1635,7 +1631,7 @@ replaces the normal implementation.
 @comment Unix98
 @deftypefun int aio_read64 (struct aiocb *@var{aiocbp})
 This function is similar to the @code{aio_read} function.  The only
-difference is that only @w{32 bits} machines the file descriptor should
+difference is that on @w{32 bits} machines the file descriptor should
 be opened in the large file mode.  Internally @code{aio_read64} uses
 functionality equivalent to @code{lseek64} (@pxref{File Position
 Primitive}) to position the file descriptor correctly for the reading,
@@ -1691,7 +1687,7 @@ request and so this error might also be signaled asynchrously.
 
 In the case @code{aio_write} returns zero the current status of the
 request can be queried using @code{aio_error} and @code{aio_return}
-questions.  As long as the value returned by @code{aio_error} is
+functions.  As long as the value returned by @code{aio_error} is
 @code{EINPROGRESS} the operation has not yet completed.  If
 @code{aio_error} returns zero the operation successfully terminated,
 otherwise the value is to be interpreted as an error code.  If the
@@ -2159,7 +2155,7 @@ function.
 This member specifies the maximal number of threads which must be used
 at any one time.
 @item int aio_num
-This number provides an esitmate on the maximal number of simultaneously
+This number provides an estimate on the maximal number of simultaneously
 enqueued requests.
 @item int aio_locks
 @c What?
@@ -2186,7 +2182,9 @@ type @code{struct aioinit} must be initialized.  Then a reference to
 this variable is passed as the parameter to @code{aio_init} which itself
 may or may not pay attention to the hints.
 
-The function has no return value and no error cases are defined.
+The function has no return value and no error cases are defined.  It is
+a extension which follows a proposal from the SGI implementation in
+@w{Irix 6}.  It is not covered by POSIX.1b or Unix98.
 @end deftypefun
 
 @node Control Operations
diff --git a/manual/sysinfo.texi b/manual/sysinfo.texi
index 993cbdaa14..9b5513300e 100644
--- a/manual/sysinfo.texi
+++ b/manual/sysinfo.texi
@@ -187,7 +187,7 @@ possibility.
 The Unix concept of @emph{Everything is a file} is based on the
 possibility to @dfn{mount} filesystems or other things into the
 filesystem.  For some programs it is desirable and necessary to access
-the information whether and if yes, where a certain filesystem is
+the information whether and, if yes, where a certain filesystem is
 mounted or simply to get lists of all the available filesystems.  The
 GNU libc provides some functions to retrieve this information portably.
 
@@ -195,8 +195,8 @@ Traditionally Unix systems have a file named @file{/etc/fstab} which
 describes all possibly mounted filesystems.  The @code{mount} program
 uses this file to mount at startup time of the system all the necessary
 filesystems.  The information about all the filesystems actually mounted
-is normally kept in a file named @file{/etc/mtab}.  Both files shared
-the same synteax and it is crucial that this syntax is followed all the
+is normally kept in a file named @file{/etc/mtab}.  Both files share
+the same syntax and it is crucial that this syntax is followed all the
 time.  Therefore it is best to never directly write the files.  The
 functions described in this section can do this and they also provide
 the functionality to convert the external textual representation to the
@@ -208,11 +208,11 @@ internal representation.
 @vindex _PATH_MOUNTED
 The filenames given above should never be used directly.  The portable
 way to handle these file is to use the macros @code{_PATH_FSTAB},
-defined in @file{fsab.h} and @code{_PATH_MNTTAB}, defined in
+defined in @file{fstab.h} and @code{_PATH_MNTTAB}, defined in
 @file{mntent.h}, respectively.  There are also two alternate macro names
 @code{FSTAB} and @code{_PATH_MOUNTED} defined but both names are
-depricated and kept only for backward compatibility.  The two former
-names always should be used.
+deprecated and kept only for backward compatibility.  The two former
+names should always be used.
 
 The internal representation for entries of the file is @w{@code{struct
 fstab}}, defined in @file{fstab.h}.
@@ -237,7 +237,7 @@ elements of this structure.
 
 @item char *fs_file
 This desribes the mount point on the local system.  I.e., accessing any
-file in this filesystem has implicitly or explicitily this string as a
+file in this filesystem has this string implicitly or explicitly as a
 prefix.
 
 @item char *fs_vfstype
@@ -251,11 +251,11 @@ more than one option, separated from the others by a comma.  Each option
 consists of a name and an optional value part, introduced by an @code{=}
 character.
 
-If the value of this element must be processed it best should happen
+If the value of this element must be processed it should best happen
 using the @code{getsubopt} function; see @ref{Suboptions}.
 
 @item const char *fs_type
-This name os poorly chosen.  This element points to a string (possibly
+This name is poorly chosen.  This element points to a string (possibly
 in the @code{fs_mntops} string) which describes the modes with which the
 filesystem is mounted.  @file{fstab} defines five macros to describe the
 possible values:
@@ -267,15 +267,15 @@ The filesystems gets mounted with read and write enabled.
 The filesystems gets mounted with read and write enabled.  Write access
 is restricted by quotas.
 @item FSTAB_RO
-The filesystem get mounted read-only.
+The filesystem gets mounted read-only.
 @item FSTAB_SW
-This is no real filesystem, it is a swap device.
+This is not a real filesystem, it is a swap device.
 @item FSTAB_XX
 This entry from the @file{fstab} file is totally ignored.
 @end vtable
 
 Testing for equality with these value must happen using @code{strcmp}
-since these are all strings.  Comparing the pointer probably always will
+since these are all strings.  Comparing the pointer will probably always
 fail.
 
 @item int fs_freq
@@ -283,7 +283,7 @@ This element describes the dump frequency in days.
 
 @item int fs_passno
 This element describes the pass number on parallel dumps.  It is closely
-related to the actual @code{dump} program used on Unix systems.
+related to the @code{dump} utility used on Unix systems.
 @end table
 @end deftp
 
@@ -310,7 +310,7 @@ file.
 @comment BSD
 @deftypefun void endfsent (void)
 This function makes sure that all resources acquired by a prior call to
-@code{setfsent} (explicit or implicitly by calling @code{getfsent}) are
+@code{setfsent} (explicitly or implicitly by calling @code{getfsent}) are
 freed.
 @end deftypefun
 
@@ -325,7 +325,7 @@ opened.
 The function returns a pointer to an variable of type @code{struct
 fstab}.  This variable is shared by all threads and therefore this
 function is not thread-safe.  If an error occurred @code{getfsent}
-return a @code{NULL} pointer.
+returns a @code{NULL} pointer.
 @end deftypefun
 
 @comment fstab.h
@@ -342,7 +342,7 @@ the file will be opened.
 The function returns a pointer to an variable of type @code{struct
 fstab}.  This variable is shared by all threads and therefore this
 function is not thread-safe.  If an error occurred @code{getfsent}
-return a @code{NULL} pointer.
+returns a @code{NULL} pointer.
 @end deftypefun
 
 @comment fstab.h
@@ -359,10 +359,10 @@ the file will be opened.
 The function returns a pointer to an variable of type @code{struct
 fstab}.  This variable is shared by all threads and therefore this
 function is not thread-safe.  If an error occurred @code{getfsent}
-return a @code{NULL} pointer.
+returns a @code{NULL} pointer.
 @end deftypefun
 
-To access the @file{matb} file there is a different set of functions and
+To access the @file{mtab} file there is a different set of functions and
 also a different structure to describe the results.
 
 
@@ -422,7 +422,7 @@ Expands to @code{"defaults"}.  This option should be used alone since it
 indicates all values for the custumizable values are chosen to be the
 default.
 @item MNTOPT_RO
-Expand to @code{"ro"}.  See the the @code{FSTAB_RO} value, it means the
+Expands to @code{"ro"}.  See the the @code{FSTAB_RO} value, it means the
 filesystem is mounted read-only.
 @item MNTOPT_RW
 Expand to @code{"rw"}.  See the the @code{FSTAB_RW} value, it means the
@@ -433,7 +433,7 @@ Change Persona}) is respected when a program from the filesystem is
 started.
 @item MNTOPT_NOSUID
 Expands to @code{"nosuid"}.  This is the opposite of @code{MNTOPT_SUID},
-the SUID bit is for all files from the filesystem ignored.
+the SUID bit for all files from the filesystem is ignored.
 @item MNTOPT_NOAUTO
 Expands to @code{"noauto"}.  At startup time the @code{mount} program
 will ignore this entry if it is started with the @code{-a} option to
@@ -456,8 +456,8 @@ which is uninteresting for all programs beside @code{dump}.
 For accessing the @file{mtab} file there is again a set of three
 functions to access all entries in a row.  Unlike the functions to
 handle @file{fstab} these functions do not access a fixed file and there
-even is a thread safe variant of the get-function.  Beside this the GNU
-libc contains function to alter the file and test for specific options.
+is even a thread safe variant of the get function.  Beside this the GNU
+libc contains functions to alter the file and test for specific options.
 
 @comment mntent.h
 @comment BSD
@@ -481,8 +481,8 @@ This function takes for the @var{stream} parameter a file handle which
 previously was returned from the @code{setmntent} call.
 @code{endmntent} closes the stream and frees all resources.
 
-The return value is @code{1} unless an error occurred in which case it
-is @code{0}.
+The return value is @math{1} unless an error occurred in which case it
+is @math{0}.
 @end deftypefun
 
 @comment mntent.h
@@ -499,7 +499,7 @@ is @code{NULL}.
 
 This function is not thread-safe since all calls to this function return
 a pointer to the same static variable.  @code{getmntent_r} should be
-used in situations where multiple threads access use the file.
+used in situations where multiple threads access the file.
 @end deftypefun
 
 @comment mntent.h
@@ -513,7 +513,7 @@ pointed to by the @var{result} parameter.  Additional information (e.g.,
 the strings pointed to by the elements of the result) are kept in the
 buffer of size @var{bufsize} pointed to by @var{buffer}.
 
-The function return in error cases a @code{NULL} pointer.  Errors could be:
+The function returns a @code{NULL} pointer in error cases.  Errors could be:
 @itemize @bullet
 @item
 error while reading the file,
@@ -527,10 +527,10 @@ end of file reached,
 @comment mntent.h
 @comment BSD
 @deftypefun int addmntent (FILE *@var{stream}, const struct mntent *@var{mnt})
-The @code{addmntent} function allows to add new entry to the file
+The @code{addmntent} function allows to add a new entry to the file
 previously opened with @code{setmntent}.  The new entries are always
 appended.  I.e., even if the position of the file descriptor is not at
-the end of the file this function does not overwrite an existing
+the end of the file this function does not overwrite an existing entry
 following the current position.
 
 The implication of this is that to remove an entry from a file one has
@@ -538,8 +538,8 @@ to create a new file while leaving out the entry to be removed and after
 closing the file remove the old one and rename the new file to the
 chosen name.
 
-This function returns @code{0} in case the operation was successful.
-Otherwise the return value is @code{1} and @code{errno} is set
+This function returns @math{0} in case the operation was successful.
+Otherwise the return value is @math{1} and @code{errno} is set
 appropriately.
 @end deftypefun
 
@@ -550,7 +550,7 @@ This function can be used to check whether the string pointed to by the
 @code{mnt_opts} element of the variable pointed to by @var{mnt} contains
 the option @var{opt}.  If this is true a pointer to the beginning of the
 option in the @code{mnt_opts} element is returned.  If no such option
-exist the function returns @code{NULL}.
+exists the function returns @code{NULL}.
 
 This function is useful to test whether a specific option is present but
 when all options have to be processed one is better off with using the
diff --git a/misc/hsearch.c b/misc/hsearch.c
index 62f8ac9fee..c5c60b1317 100644
--- a/misc/hsearch.c
+++ b/misc/hsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>
    This file is part of the GNU C Library.
 
@@ -46,11 +46,12 @@ hcreate (nel)
 
 
 void
-hdestroy ()
+__hdestroy ()
 {
   hdestroy_r (&htab);
 }
+weak_alias (__hdestroy, hdestroy)
 
 /* Make sure the table is freed if we want to free everything before
    exiting.  */
-text_set_element (__libc_subfreeres, hdestroy);
+text_set_element (__libc_subfreeres, __hdestroy);
diff --git a/misc/search.h b/misc/search.h
index 1cd4fdb9ef..2258ce9d3a 100644
--- a/misc/search.h
+++ b/misc/search.h
@@ -1,5 +1,5 @@
 /* Declarations for System V style searching functions.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -90,6 +90,7 @@ extern ENTRY *hsearch __P ((ENTRY __item, ACTION __action));
 extern int hcreate __P ((size_t __nel));
 
 /* Destroy current internal hashing table.  */
+extern void __hdestroy __P ((void));
 extern void hdestroy __P ((void));
 
 #ifdef __USE_GNU
diff --git a/string/bits/string2.h b/string/bits/string2.h
index e26d4df53a..0d378039fe 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -428,7 +428,7 @@ __STRING2_COPY_TYPE (8);
   (__extension__ (__builtin_constant_p (s1) && __builtin_constant_p (s2)      \
 		  && (!__string2_1bptr_p (s1) || strlen (s1) >= 4)	      \
 		  && (!__string2_1bptr_p (s2) || strlen (s2) >= 4)	      \
-		  ? memcmp ((__const char *) s1, (__const char *) s2,	      \
+		  ? memcmp ((__const char *) (s1), (__const char *) (s2),     \
 			    (strlen (s1) < strlen (s2)			      \
 			     ? strlen (s1) : strlen (s2)) + 1)		      \
 		  : (__builtin_constant_p (s1) && __string2_1bptr_p (s1)      \
diff --git a/sysdeps/generic/backtracesyms.c b/sysdeps/generic/backtracesyms.c
index 36bd39caaf..76019eec3d 100644
--- a/sysdeps/generic/backtracesyms.c
+++ b/sysdeps/generic/backtracesyms.c
@@ -29,12 +29,12 @@
 
 char **
 __backtrace_symbols (array, size)
-     const void **array;
+     void *const *array;
      int size;
 {
   int cnt;
   size_t total = 0;
-  const char **result;
+  char **result;
 
   /* We can compute the text size needed for the symbols since we print
      them all as "[%<addr>]".  */
diff --git a/sysdeps/generic/elf/backtracesyms.c b/sysdeps/generic/elf/backtracesyms.c
index 11a65ea267..9941644f66 100644
--- a/sysdeps/generic/elf/backtracesyms.c
+++ b/sysdeps/generic/elf/backtracesyms.c
@@ -35,7 +35,7 @@
 
 char **
 __backtrace_symbols (array, size)
-     const void **array;
+     void *const *array;
      int size;
 {
   Dl_info info[size];