diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-05 19:18:13 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-05 19:18:13 +0000 |
| commit | dbe31b9a738993b563382c602d092c970bdc79ae (patch) | |
| tree | d2150cd99276abac237c29308b843f2a33db40d3 /misc | |
| parent | f5348425d095f93cce1532c7ca20915aea480868 (diff) | |
| download | glibc-dbe31b9a738993b563382c602d092c970bdc79ae.tar.gz glibc-dbe31b9a738993b563382c602d092c970bdc79ae.tar.xz glibc-dbe31b9a738993b563382c602d092c970bdc79ae.zip | |
* nss/nss_files/files-parse.c (parse_list): Set EOL from LINE if it
points within DATA->linebuffer; otherwise use all of DATA->linebuffer itself, no need to skip past a NUL. * nss/nsswitch.h (known_function): Comment fix. * nss/nsswitch.c (nss_lookup_function): Rewritten using __tsearch directly. Do the lookup and insertion with a single call, and fill in the tree node afterwards if new. (known_compare, nss_find_entry, nss_insert_entry): Functions removed. * misc/sys/select.h: #define __need_timespec before <sys/time.h> incl. (struct timeval): Add bodiless decl for scope. * time/time.h (struct timespec): Rename members from `ts_*' to `tv_*'. Move struct timespec defn outside [_TIME_H] so it can be got with #define __need_timespec. * time/sys/time.h (TIMEVAL_TO_TIMESPEC): Use `tv_*' instead of `ts_*' for `struct timespec' member names. (TIMESPEC_TO_TIMEVAL): Likewise. * nss/Makefile (extra-libs-others): New variable. * extra-lib.mk: Don't test for $($(lib)-no-lib-dep). Instead match $(lib) in $(extra-libs-others). * sunrpc/Makefile (extra-libs-others): New variable. (librpcsvc-no-lib-dep): Variable removed. Thu Jul 4 05:21:59 1996 David Mosberger-Tang <davidm@azstarnet.com> * login/utmp.h: Fix typos. * misc/syslog.c (vsyslog): Use __send instead of send and __connect instead of connect to avoid name-space collisions (e.g., with psgetty).
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/sys/select.h | 11 | ||||
| -rw-r--r-- | misc/syslog.c | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/misc/sys/select.h b/misc/sys/select.h index ece1916c0d..320df02e02 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -28,14 +28,17 @@ Boston, MA 02111-1307, USA. */ #include <gnu/types.h> /* Get definition of timer specification structures. */ -/* XXX this is wrong. 1003.1gD6.1 says `struct timespec' - is defined by <sys/select.h>, and that is all. - However, since a program is required to include <sys/time.h> - before using select/pselect anyway, perhaps it doesn't matter. */ +#define __need_timespec #include <sys/time.h> __BEGIN_DECLS +/* This declaration puts `struct timeval' in global scope even if + <sys/time.h> has not been included to define it. That way the + `select' prototype below will not conflict with a later definition + of `struct timeval'. */ +struct timeval; + /* Representation of a set of file descriptors. */ #define fd_set __fd_set diff --git a/misc/syslog.c b/misc/syslog.c index 068a89e919..bcac6c74cb 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -163,7 +163,7 @@ vsyslog(pri, fmt, ap) /* Get connected, output the message to the local logger. */ if (!connected) openlog(LogTag, LogStat | LOG_NDELAY, 0); - if (send(LogFile, buf, bufsize, 0) < 0) + if (__send(LogFile, buf, bufsize, 0) < 0) { /* * Output the message to the console; don't worry about blocking, @@ -205,11 +205,12 @@ openlog(ident, logstat, logfac) } } if (LogFile != -1 && !connected) - if (connect(LogFile, &SyslogAddr, sizeof(SyslogAddr)) == -1) { + if (__connect(LogFile, &SyslogAddr, sizeof(SyslogAddr)) == -1) + { (void)close(LogFile); LogFile = -1; } else - connected = 1; + connected = 1; } void |