diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | manual/stdio.texi | 6 | ||||
| -rwxr-xr-x | sysdeps/generic/configure | 7 | ||||
| -rwxr-xr-x | sysdeps/unix/common/configure | 6 | ||||
| -rwxr-xr-x | sysdeps/unix/configure | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 42 |
6 files changed, 42 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog index 42c69c01ae..83ee634a17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1999-05-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * manual/stdio.texi: Fix some typos. + 1999-05-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * malloc/malloc.h: Properly handle future GCC versions. diff --git a/manual/stdio.texi b/manual/stdio.texi index 9cf4c9fb68..8c6c009c4c 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -1620,7 +1620,7 @@ In practice, it is often easier just to use @code{asprintf}, below. @strong{Attention:} In the GNU C library version 2.0 the return value is the number of characters stored, not including the terminating null. If this value equals @code{@var{size} - 1}, then there was not enough -space in @var{s} for all the output. This change was neccessary with +space in @var{s} for all the output. This change was necessary with the adoption of snprintf by ISO C9x. @end deftypefun @@ -2211,7 +2211,7 @@ width. The value is @code{'0'} if the @samp{0} flag was specified, and Now let's look at how to define the handler and arginfo functions which are passed as arguments to @code{register_printf_function}. -@strong{Compatibility Note:} The interface change in the GNU libc +@strong{Compatibility Note:} The interface changed in the GNU libc version 2.0. Previously the third argument was of type @code{va_list *}. @@ -4353,7 +4353,7 @@ form. The string must contain two fields, separated by a colon produced no output since the class with the numeric value @code{6} is not defined. Although a class with numeric value @code{5} is also not defined by default, the call the @code{addseverity} introduces it and -the second call to @code{fmtmsg} produces the above outout. +the second call to @code{fmtmsg} produces the above output. When we change the environment of the program to contain @code{SEV_LEVEL=XXX,6,NOTE} when running it we get a different result: diff --git a/sysdeps/generic/configure b/sysdeps/generic/configure index 574808f5e8..2091818665 100755 --- a/sysdeps/generic/configure +++ b/sysdeps/generic/configure @@ -5,7 +5,7 @@ for ac_func in psignal do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:8: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -18,6 +18,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -27,12 +28,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:36: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/sysdeps/unix/common/configure b/sysdeps/unix/common/configure index acd4ef23fe..5b50dd05b0 100755 --- a/sysdeps/unix/common/configure +++ b/sysdeps/unix/common/configure @@ -4,7 +4,7 @@ if test -z "$inhibit_glue"; then # Find out what this system calls `sys_siglist'. echo $ac_n "checking for sys_siglist""... $ac_c" 1>&6 echo "configure:7: checking for sys_siglist" >&5 -if eval "test \"`echo '$''{'ac_cv_check_symbol_sys_siglist'+set}'`\" = set"; then +if eval "test \"\${ac_cv_check_symbol_sys_siglist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -37,7 +37,7 @@ fi echo "$ac_t""$ac_cv_check_symbol_sys_siglist" 1>&6 echo $ac_n "checking for _sys_siglist""... $ac_c" 1>&6 echo "configure:40: checking for _sys_siglist" >&5 -if eval "test \"`echo '$''{'ac_cv_check_symbol__sys_siglist'+set}'`\" = set"; then +if eval "test \"\${ac_cv_check_symbol__sys_siglist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -73,7 +73,7 @@ echo "$ac_t""$ac_cv_check_symbol__sys_siglist" 1>&6 # classification. This is used by sysdeps/unix/common/glue-ctype.c. echo $ac_n "checking ctype array name for glue""... $ac_c" 1>&6 echo "configure:76: checking ctype array name for glue" >&5 -if eval "test \"`echo '$''{'libc_cv_ctype_glue'+set}'`\" = set"; then +if eval "test \"\${libc_cv_ctype_glue+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ctype in _ctype_ __ctype_ __ctype _ctype__ _ctype _locp; do diff --git a/sysdeps/unix/configure b/sysdeps/unix/configure index b7eff0368d..0acc2277b0 100755 --- a/sysdeps/unix/configure +++ b/sysdeps/unix/configure @@ -6,7 +6,7 @@ for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:9: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -19,6 +19,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -28,12 +29,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:37: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 46030bf10f..fcdf97dc5c 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -20,22 +20,20 @@ else #line 21 "configure" #include "confdefs.h" #include <linux/version.h> -int main() { -#if LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ +#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ eat flaming death #endif -; return 0; } EOF -if { (eval echo configure:30: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "eat flaming death" >/dev/null 2>&1; then rm -rf conftest* - libc_cv_linux2010='2.0.10 or later' + libc_cv_linux2010='TOO OLD!' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - libc_cv_linux2010='TOO OLD!' + libc_cv_linux2010='2.0.10 or later' fi rm -f conftest* + fi echo "$ac_t""$libc_cv_linux2010" 1>&6 @@ -54,28 +52,36 @@ fi # kernel headers are young enough. if test -n "$minimum_kernel"; then echo $ac_n "checking for kernel header at least $minimum_kernel""... $ac_c" 1>&6 -echo "configure:58: checking for kernel header at least $minimum_kernel" >&5 - decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\(\([0-9]*\)\|\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +echo "configure:56: checking for kernel header at least $minimum_kernel" >&5 + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; cat > conftest.$ac_ext <<EOF +#line 59 "configure" +#include "confdefs.h" #include <linux/version.h> -int main() { #if LINUX_VERSION_CODE < $decnum eat flaming death #endif -; return 0; } EOF - if { (eval echo configure:30: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "eat flaming death" >/dev/null 2>&1; then + rm -rf conftest* + libc_minimum_kernel='too old!' +else + rm -rf conftest* + libc_minimum_kernel=ok +fi +rm -f conftest* + + echo "$ac_t""$libc_minimum_kernel" 1>&6 + if test "$libc_minimum_kernel" = ok; then cat >> confdefs.h <<EOF #define __LINUX_KERNEL_VERSION $decnum EOF - echo "$ac_t""ok" 1>&6 else - echo "$ac_t""too old!" 1>&6 - { echo "configure: error: *** The available kernel headers are not at least as old as the requested + { echo "configure: error: *** The available kernel headers are older than the requested *** compatible kernel version" 1>&2; exit 1; } fi - rm -f conftest* fi if test -n "$sysheaders"; then @@ -164,7 +170,7 @@ if test $host = $build; then ac_prefix=$ac_default_prefix fi echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6 -echo "configure:168: checking for symlinks in ${ac_prefix}/include" >&5 +echo "configure:174: checking for symlinks in ${ac_prefix}/include" >&5 ac_message= if test -L ${ac_prefix}/include/net; then ac_message="$ac_message |