diff options
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/unix/sysv/linux/configure | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/termbits.h | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index a6137d9ba8..79dbf16912 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -3,20 +3,17 @@ # On Linux, the default is to use libio instead of stdio. test $stdio = default && stdio=libio -# We also use the new malloc by default. -test $malloc = default && malloc=new-malloc - # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6 -echo "configure:15: checking installed Linux kernel header files" >&5 +echo "configure:12: checking installed Linux kernel header files" >&5 if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20 "configure" +#line 17 "configure" #include "confdefs.h" #include <linux/version.h> int main() { @@ -25,7 +22,7 @@ eat flaming death #endif ; return 0; } EOF -if { (eval echo configure:29: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_linux2010='2.0.10 or later' else diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 0c77d7d75f..18bb6dc469 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -5,9 +5,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # On Linux, the default is to use libio instead of stdio. test $stdio = default && stdio=libio -# We also use the new malloc by default. -test $malloc = default && malloc=new-malloc - # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes diff --git a/sysdeps/unix/sysv/linux/termbits.h b/sysdeps/unix/sysv/linux/termbits.h index f8e59f1d3b..8224ac5403 100644 --- a/sysdeps/unix/sysv/linux/termbits.h +++ b/sysdeps/unix/sysv/linux/termbits.h @@ -17,6 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _TERMBITS_H +#define _TERMBITS_H 1 + typedef unsigned char cc_t; typedef unsigned int speed_t; typedef unsigned int tcflag_t; @@ -177,3 +180,5 @@ struct termios #define _IOT_termios /* Hurd ioctl type field. */ \ _IOT (_IOTS (cflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2) + +#endif /* termbits.h */ |