diff options
| author | Roland McGrath <roland@gnu.org> | 2003-02-26 00:01:15 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-02-26 00:01:15 +0000 |
| commit | 4e5b051fad8e6707736d3ddc4819ab797d23cd91 (patch) | |
| tree | 62562086317b2efeee225689d548ef0990381cf3 /sysdeps/unix/sysv | |
| parent | 1d02f71fe4046c1cd17ff6b6687a89932797cb3b (diff) | |
| download | glibc-4e5b051fad8e6707736d3ddc4819ab797d23cd91.tar.gz glibc-4e5b051fad8e6707736d3ddc4819ab797d23cd91.tar.xz glibc-4e5b051fad8e6707736d3ddc4819ab797d23cd91.zip | |
Revert unintentional commits.
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-librecon.h | 7 |
2 files changed, 3 insertions, 16 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index a1db0aab0e..721d6e7264 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -44,11 +44,7 @@ if test "${libc_cv_linux2010+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <linux/version.h> #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ eat flaming death @@ -169,11 +165,7 @@ echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >& abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <linux/version.h> #if LINUX_VERSION_CODE < $decnum eat flaming death diff --git a/sysdeps/unix/sysv/linux/dl-librecon.h b/sysdeps/unix/sysv/linux/dl-librecon.h index 91535da37d..afe1ec4b72 100644 --- a/sysdeps/unix/sysv/linux/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/dl-librecon.h @@ -1,5 +1,5 @@ /* Optional code to distinguish library flavours. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -39,12 +39,7 @@ _dl_osversion_init (char *assume_kernel) if (!*q) break; } -#if __LINUX_KERNEL_VERSION > 0 - if (osversion < __LINUX_KERNEL_VERSION) - osversion = __LINUX_KERNEL_VERSION; -#else if (osversion) -#endif GL(dl_osversion) = osversion; } |