diff options
| author | Roland McGrath <roland@gnu.org> | 1995-04-08 19:09:39 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-04-08 19:09:39 +0000 |
| commit | 883bc19b7c819edce146ca43b77991f7dcf0608b (patch) | |
| tree | 33786f9e6d51680425f70d294b35237aa03f71da /sysdeps/unix | |
| parent | 8ab69eb33086a5cb11846414487fe22da5b93154 (diff) | |
| download | glibc-883bc19b7c819edce146ca43b77991f7dcf0608b.tar.gz glibc-883bc19b7c819edce146ca43b77991f7dcf0608b.tar.xz glibc-883bc19b7c819edce146ca43b77991f7dcf0608b.zip | |
* locale/loadlocale.c (_nl_load_locale): Use MAP_INHERIT flag in
mmap call. * configure.in (os=freebsd*|bsdi*): Set base_os=unix/bsd/bsd4.4 for these too. * sysdeps/unix/sysv/tcsetattr.c: Use |= instead of = to properly set c_oflag value. * Makeconfig [! objpfx] (csu-objpfx): Add trailing slash. * locale/Makefile (categories): Uncomment collate. * locale/lc-collate.c: New file.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/tcsetattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/tcsetattr.c b/sysdeps/unix/sysv/tcsetattr.c index 30e1b0b48d..230a258e42 100644 --- a/sysdeps/unix/sysv/tcsetattr.c +++ b/sysdeps/unix/sysv/tcsetattr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995 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 @@ -123,9 +123,9 @@ DEFUN(tcsetattr, (fd, optional_actions, termios_p), buf.c_oflag = 0; if (termios_p->c_oflag & OPOST) - buf.c_oflag = _SYSV_OPOST; + buf.c_oflag |= _SYSV_OPOST; if (termios_p->c_oflag & ONLCR) - buf.c_oflag = _SYSV_ONLCR; + buf.c_oflag |= _SYSV_ONLCR; /* So far, buf.c_cflag contains the speed in CBAUD. */ if (termios_p->c_cflag & CSTOPB) |