diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tcflow.c | 32 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tcflush.c | 32 |
4 files changed, 67 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 9705085966..8f19ac70d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2005-11-07 Roland McGrath <roland@redhat.com> + * malloc/malloc.c (munmap_chunk): Suppress warnings from last change. + * sysdeps/unix/bsd/sun: Directory and all subdirectories removed, saved in ports repository. + * sysdeps/unix/sysv/linux/tcflush.c: Rewritten. + * sysdeps/unix/sysv/linux/tcflow.c: Rewritten. 2005-11-06 Ulrich Drepper <drepper@redhat.com> diff --git a/malloc/malloc.c b/malloc/malloc.c index e315b21759..f9aa5b1226 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3292,7 +3292,7 @@ munmap_chunk(p) mchunkptr p; mp_.n_mmaps--; mp_.mmapped_mem -= total_size; - int ret = munmap(block, total_size); + int ret __attribute__ ((unused)) = munmap((char *)block, total_size); /* munmap returns non-zero on failure */ assert(ret == 0); diff --git a/sysdeps/unix/sysv/linux/tcflow.c b/sysdeps/unix/sysv/linux/tcflow.c index 5be68e2ea2..6e72370272 100644 --- a/sysdeps/unix/sysv/linux/tcflow.c +++ b/sysdeps/unix/sysv/linux/tcflow.c @@ -1 +1,31 @@ -#include <sysdeps/unix/bsd/sun/sunos4/tcflow.c> +/* tcflow -- Suspend or restart transmission on termios file descriptor. + Copyright (C) 1993,1997,2005 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <termios.h> +#include <sys/ioctl.h> + +/* Suspend or restart transmission on FD. */ +int +tcflow (fd, action) + int fd; + int action; +{ + return __ioctl (fd, TCXONC, action); +} diff --git a/sysdeps/unix/sysv/linux/tcflush.c b/sysdeps/unix/sysv/linux/tcflush.c index 78e09b2f75..cae419f4a9 100644 --- a/sysdeps/unix/sysv/linux/tcflush.c +++ b/sysdeps/unix/sysv/linux/tcflush.c @@ -1 +1,31 @@ -#include <sysdeps/unix/bsd/sun/sunos4/tcflush.c> +/* tcflush -- Flush pending data on termios file descriptor. Linux version. + Copyright (C) 1993,1997,2005 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <termios.h> +#include <sys/ioctl.h> + +/* Flush pending data on FD. */ +int +tcflush (fd, queue_selector) + int fd; + int queue_selector; +{ + return __ioctl (fd, TCFLSH, queue_selector); +} |