* malloc/malloc.c (munmap_chunk): Suppress warnings from last change.

* sysdeps/unix/sysv/linux/tcflush.c: Rewritten.
	* sysdeps/unix/sysv/linux/tcflow.c: Rewritten.
This commit is contained in:
Roland McGrath 2005-11-07 23:00:18 +00:00
parent 0809061421
commit 2182b1ea17
4 changed files with 67 additions and 3 deletions

View File

@ -1,7 +1,11 @@
2005-11-07 Roland McGrath <roland@redhat.com> 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, * sysdeps/unix/bsd/sun: Directory and all subdirectories removed,
saved in ports repository. 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> 2005-11-06 Ulrich Drepper <drepper@redhat.com>

View File

@ -3292,7 +3292,7 @@ munmap_chunk(p) mchunkptr p;
mp_.n_mmaps--; mp_.n_mmaps--;
mp_.mmapped_mem -= total_size; 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 */ /* munmap returns non-zero on failure */
assert(ret == 0); assert(ret == 0);

View File

@ -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);
}

View File

@ -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);
}