about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-06-01 08:17:11 +0000
committerAndreas Jaeger <aj@suse.de>2001-06-01 08:17:11 +0000
commit852d75f9d618a77697d5869d188511740f992793 (patch)
tree3a30746f3aa1136ef6d7d3c484b5a04efbe9e189
parent371881fe91cc652dc8f556802cdccd650a94507c (diff)
downloadglibc-852d75f9d618a77697d5869d188511740f992793.tar.gz
glibc-852d75f9d618a77697d5869d188511740f992793.tar.xz
glibc-852d75f9d618a77697d5869d188511740f992793.zip
Update.
2001-06-01  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/speed.c (cfsetispeed): Max speed is
	B4000000.
	(cfsetospeed): Likewise.
	Reported by Lukasz Trabinski <lukasz@lt.wsisiz.edu.pl>.

2001-05-31  Joseph S. Myers  <jsm28@cam.ac.uk>

	* misc/sys/cdefs.h (__restrict_arr): Define to empty for C++.
-rw-r--r--ChangeLog11
-rw-r--r--misc/sys/cdefs.h4
-rw-r--r--sysdeps/unix/sysv/linux/speed.c6
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a1af0d9340..ad8b77ffed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-01  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/speed.c (cfsetispeed): Max speed is
+	B4000000.
+	(cfsetospeed): Likewise.
+	Reported by Lukasz Trabinski <lukasz@lt.wsisiz.edu.pl>.
+
+2001-05-31  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* misc/sys/cdefs.h (__restrict_arr): Define to empty for C++.
+
 2001-05-30  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: greg_t
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index ec3b48d212..5a9d826735 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,93,94,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 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
@@ -196,7 +196,7 @@
 /* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
      array_name[restrict]
    GCC 3.1 supports this.  */
-#if __GNUC_PREREQ (3,1)
+#if __GNUC_PREREQ (3,1) && !defined __GNUG__
 # define __restrict_arr	__restrict
 #else
 # ifdef __GNUC__
diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c
index 1244eb4c01..075c01de3f 100644
--- a/sysdeps/unix/sysv/linux/speed.c
+++ b/sysdeps/unix/sysv/linux/speed.c
@@ -1,5 +1,5 @@
 /* `struct termios' speed frobnication functions.  Linux version.
-   Copyright (C) 1991, 92, 93, 95, 96, 97, 98 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 95, 96, 97, 98, 2000 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
@@ -60,7 +60,7 @@ cfsetospeed  (termios_p, speed)
      speed_t speed;
 {
   if ((speed & ~CBAUD) != 0
-      && (speed < B57600 || speed > B460800))
+      && (speed < B57600 || speed > B4000000))
     {
       __set_errno (EINVAL);
       return -1;
@@ -82,7 +82,7 @@ cfsetispeed (termios_p, speed)
      speed_t speed;
 {
   if ((speed & ~CBAUD) != 0
-      && (speed < B57600 || speed > B460800))
+      && (speed < B57600 || speed > B4000000))
     {
       __set_errno (EINVAL);
       return -1;