update from main archive 961101 cvs/libc-961104 cvs/libc-961103 cvs/libc-961102

Sat Nov  2 01:48:47 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/errnos.h: Move declaration of errno
	and __errno_location to correct position.

Thu Oct 31 22:51:25 1996  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile (distribute): Add rellns-sh.
	* rellns-sh: New file.
	* Makerules (make-link): Use rellns-sh.
	* time/Makefile ($(installed-localtime-file)): Likewise.

Thu Oct 31 11:33:01 1996  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile ($objpfx)ldd) Substitute $(version) for @VERSION@.
	(distribute): Add ldd.bash.in.
	* elf/ldd.sh.in: Process --help and --version parameter.
	Correct comments.
	* elf/ldd.bash.in: New file.

	* stdlib/stdlib.h: Add prototype for clearenv.
	* sysdeps/generic/setenv.c: Add implementation of clearenv.
	(setenv): Handle __environ == NULL correctly.
	* sysdeps/stub/setenv.c: Add stub definition for unsetenv and
	clearenv.

	* sysdeps/generic/putenv.c: Correct layout to fit in libit.
	* sysdeps/generic/setenv.c: Likewise.
	* stdlib/strtol.h: Likewise.

	* time/sys/time.h: Define __need_timeval and include <timebits.h>.
	Remove definition of struct timeval.
	* sysdeps/stub/timebits.h [__need_timeval]: Define struct timeval
	using `time_t' for members.
	* sysdeps/unix/sysv/linux/timebits.h [__need_timeval]: Likewise.
	* sysdeps/unix/sysv/linux/alpha/timebits.h: New file.  Same
	as old Linux specific version.

	* string/argz.h: Use __const in definitions.
	* inet/herrno.c: Don't define __h_errno, only h_errno otherwise the
	__syscall_error defined.
	TRACE_MODE.
	Craig Metz.
	arithmetic.
	buggy and more competent people work on a usable version which is
	distributed separately.
	`finitel'.
	better message if it is not available.
	whether read failed.
	PSEUDO_END macro.
	Especially on the currently supported ELF systems the nlist
	function comes with the libelf.
	"$(i18ndir)/charmaps".
	net/if_arp.h, and net/route.h.
	version.
	EXTERN_PARSER is defined.
	set errno (to ENOMEM).
	nothing is found.  This guarantees all subsequent calls behave
	the same.
	the file even if no `era's are specified.
	pointers.
	_llseek to _llseek (not llseek).
	Initialize `result'.
	end_alt_digits.
	__libc_force_cancel_wrapper when compiling reentrant version.
	a weak alias.
	make tcdrain a weak alias.
	lseek, open, read, and write to have __libc_ prefix and make old
	names a weak alias.
	to fpathconf.
	__libc_setlocale_lock.
	ld.so.preload.  Suggested by David Engel <david@elo.ods.com>.
	on the same device as the password file.
	variable.
	to lock when passing it to __libc_lock_init macro.
	sysdep.h to the top outside of #ifndef PIC.  Don't include errnos.h.
	Use the ENTRY macro.
	9th field.
	and sys/vt.h.
	`_dl_start' so that linking fails if this file should ever be used
	in ld.so.
	RMS' last standard revision.
	(sysdep_headers): Remove sys/sysinfo.h.
	match files in the sysdeps hierachy (welcome back,
	sys/syscall.h!).
	categories which succeeded to load after a wrong or missing data
	file was observed.
	_IO_flockfile and _IO_funlockfile resp.
	all three versions of the math function.
	non-trivial inline functions.
	rpath-link so that running the check finds the new library.
	daylight saving, timezone by time zone.
	syscall_error handler for reentrant libc.
	warning.
	_IO_getc_unlocked.
	in version information banner.
	clearerr_u, feof_u, ferror_u, fputc_u, getc_u, getchar_u,
	iofflush_u, putc_u, putchar_u, ioflockfile.
	using __errno_location function.
	syscall_error handler for reentrant libc.
	definition of function itself.
	funlockfile.
	_malloc_loc.
	but _POSIX_THREAD_DESTRUCTOR_ITERATIONS.
	Add macro `errno' to get thread specific variable.
	__errno_location function.
	* malloc/free.c (free): __lib_malloc_lock -> __libc_malloc_lock.
	case, so don't prepend uppercase `ISO' for only numeric arg.
	call to __libc_lock_lock.
	sys/sysmacros.h.  Reported by Curtiss <1CMC3466@IBM.MTSAC.EDU>.
	stamp file.
	generating stamp file.
	implementation.
	`decimal' char is 0.
	noexpr to "^[nN]"; this conforms to POSIX.2.
	conform to POSIX.2.
	mon_grouping, int_frac_digits, frac_digits, p_cs_precedes,
	p_sep_by_space, n_cs_precedes, n_sep_by_space, p_sign_posn, and
	n_sign_posn to CHAR_MAX, as required by the POSIX Standard.
	variable.
	this changes the global state for `localtime' and `gmtime'.  Use
	`__localtime_r'/`__gmtime_r' instead.
	state.
	getutid_r() fails with ESRCH.  Reported by Miquel van Smoorenburg.
	for "Jensen" so _bus_base() returns 0 on that platform.  Use
	_bus_base_sparse() to determine base address of sparse memory.
	are now in $P/stdio-common.pot.
	script at run time, not configure time.
	warning.
	sorted.
	inet_net_pton, inet_net.
	value of sprintf.
	functions instead of BSD `b*' functions.
	$(objpfx)/mach-syscalls.mk.
	<marcus@sysc.pdx.edu> for the patch.)
	before returning.  Reported by Miles Bader.
	__BEGIN_DECLS/__END_DECLS up so ntohl() et al are bracketed as
	well.
	This is not a gross hack, after all---for compatibility,
	getlogin() really should check fd 0 only and not try to base its
	operation on the controlling tty.
	change utmp_data from static to auto.
	_IO_file_flags.  It's the same as _flags.
	call is only a stub.
	Mikasa.
	pointer as __const.
	segfault when called with an N that is not a multiple of four and
	src[N-1]=='\0'.
	try again with SOCK_STREAM (the Linux syslogd uses a socket of the
	latter type).
	terminator as a record-delimiter.  If __send(LogFile) fails,
	`getutline_r'.
	`setutline_r'.
	of `vscanf'.
	name a weak alias.
	typo.
	initialized in init-first.c.  Some actions in the libc work
	different when libc is static or dynamic.
	`__libc_is_static' variable to determine whether call to
	`personality' and `setfpucw' is necessary.  When done set variable
	to +-1 depending on library type.
	`__libc_enable_secure' instead of calling `get{,e}{g,u}id()' to
	determine whether it's a SET[UG]ID program.
	(open_file): New function, contents mostly from __open.
	LD_TRACE_LOADED_OBJECTS is set.
	n)' equivalent to `strncpy (d, s, n), d += strnlen (d, n)'.
	from the USA any software that even makes it easy to drop in an
	encryption module of foreign origin.
	old code would have failed on a big-endian 64-bit architecture).
	Remove gratitous parentheses around return expressions.
	not int.
	ustatbits.h.
	alphabetically correct place.  Mention ustat.
	record always gets appended at end of file (wtmp is a log file,
	after all).  Set ut_type to DEAD_PROCESS if name is empty.
	ut_line matches and type is either USER_PROCESS or LOGIN_PROCESS.
	avoid duplicate declarations.
	word extends right up to rmargin.
	point_col ssize_t.
	to fiddle __put_limit in conjunction with __linebuf_active.
	of, not the ones he is _not_ a member of.
	instead of a local function.  The latter are difficult to debug
	and slow to execute on certain platforms.
	place of sizeof (dev).  The size of a literal string includes the
	NUL byte.
	entry.  Return 1 on error, not -1.
	shift amount for Jensen must be 5 not 4.
	for send and connect syscalls.
	signed<->unsigned warnings.
	variable name, so new a libc with new requirements won't fail to
	notice an insufficient Linux version.
	PENDIN, NOFLSH): Undefine these at start if they are already
	defined to avoid collision with termbits.h.
	error is 0.  The "placeholder" entries recently added to
	memcpy for possibly overlapping strings.
	instead of weak_symbol (NAME) after the defn.
	necessary using current implementation of memcpy, but...).
	Move struct timespec defn outside [_TIME_H] so it can be got with
	#define __need_timespec.
	__connect instead of connect to avoid name-space collisions (e.g.,
	with psgetty).
	function ctype_is_charmap to ctype_is_charconv.
	charconv.
	charconv.
	lables according to this.
	warnings.
	actually do something.
	sysdeps/unix/sysv/linux/m68k/init-first.h,
	sysdeps/unix/sysv/linux/i386/init-first.h: New files.
	init-first.h to make abstract machine dependent parts of
	typo/extraneous whitespace.
	check-for-pending signals code, release _hurd_siglock before
	jumping to deliver_pending.
	size_t.
	soname of a loaded object, use that object.
	if libnss_dns.so module for DNS name lookup in NSS service.
	guessing to not assume p_vaddr of first load cmd is zero.
	only for ?s, not for *s.  Fix from Chet Ramey.
	about currently used character set.
	name `MAX_IOVEC'.  Instead use standard name `UIO_MAXIOV'.
	(xdrrec_getlong), sunrpc/xdr_mem.c (xdrmem_getlong): Make sure
	appropriate sign-extension is performed on machines with
	sizeof(long) > 4.
	sizeof(int)<sizeof(long), we need to go through a temporary
	variable.
	in efect.
	volatile to avoid "might get clobbered by longjmp" warning.
	unless _LOOSE_KERNEL_NAMES is in effect (which, with high
	probability is a sure loser).
	sysdeps/unix/sysv/linux/alpha/brk.S,
	sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S,
	sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S,
	sysdeps/unix/sysv/linux/alpha/llseek.S,
	sysdeps/unix/sysv/linux/alpha/sigsuspend.S,
	sysdeps/unix/sysv/linux/alpha/syscall.S: Rename syscall_error to
	__syscall_error to avoid intruding application name space.
	sysdeps/unix/geteuid.S, sysdeps/unix/getppid.S,
	sysdeps/unix/execve.S, sysdeps/unix/fork.S,
	sysdeps/unix/syscall.S: Terminate syscall with PSEUDO_END.
	(PSEUDO_END): Rename END() to PSEUDO_END().
	to PSEUDO_END to improve branch-prediction.  Include .frame
	directive to make syscalls debugabble.
	sysdeps/unix/sysv/linux/alpha/brk.S: Use ldiq instead of ldi since
	latter is illegal under DEC Unix.
	as well.
	EWOULDBLOCK -> EAGAIN mapping was unnecessary since
	EWOULDBLOCK==EAGAIN under DEC Unix and Linux/Alpha).
	address register in the .frame directive.
	avoid RPC definitions of INADDR_LOOPBACK and/or MAXHOSTNAMELEN.
	compilable under c++.
	as unsigned long, not as int (to avoid incorrect int->long
	promotion).

4 files changed, 274 insertions, 32 deletions

diff --git a/sysdeps/unix/sysv/linux/alpha/timebits.h b/sysdeps/unix/sysv/linux/alpha/timebits.h
new file mode 100644
index 0000000000..f777dc2aa8
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/timebits.h
@@ -0,0 +1,41 @@
+/* System-dependent timing definitions.  Linux/Alpha version.
+   Copyright (C) 1996 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 Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifdef __need_timeval
+# undef __need_timeval
+# ifndef _STRUCT_TIMEVAL
+#  define _STRUCT_TIMEVAL	1
+/* A time value that is accurate to the nearest
+   microsecond but also has a range of years.  */
+struct timeval
+  {
+    int tv_sec;			/* Seconds.  */
+    int tv_usec;		/* Microseconds.  */
+  };
+# endif	/* struct timeval */
+#endif	/* need timeval */
+
+
+#ifndef _TIMEBITS_H
+#define	_TIMEBITS_H	1
+
+#include <asm/param.h>
+#define CLOCKS_PER_SEC HZ	/* XXX names not kosher */
+
+#endif	/* timebits.h */
diff --git a/sysdeps/unix/sysv/linux/errnos.h b/sysdeps/unix/sysv/linux/errnos.h
index 4456e570f0..53a2ec053d 100644
--- a/sysdeps/unix/sysv/linux/errnos.h
+++ b/sysdeps/unix/sysv/linux/errnos.h
@@ -1,21 +1,21 @@
 /* errnos.h - error constants.  Linux specific version.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996 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 Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
+   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
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifdef _ERRNO_H
 
@@ -24,13 +24,13 @@ Boston, MA 02111-1307, USA.  */
 # include <linux/errno.h>
 
 # ifndef __ASSEMBLER__
-#  ifdef _LIBC
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
 /* Function to get address of global `errno' variable.  */
 extern int *__errno_location __P ((void)) __attribute__ ((__const__));
 
+#  if defined _LIBC
 #   ifdef _LIBC_REENTRANT
 static inline int
 __set_errno (int __err)
diff --git a/sysdeps/unix/sysv/linux/resourcebits.h b/sysdeps/unix/sysv/linux/resourcebits.h
new file mode 100644
index 0000000000..69a0cfdc7d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/resourcebits.h
@@ -0,0 +1,186 @@
+/* Bit values & structures for resource limits.  Linux version.
+Copyright (C) 1994, 1996 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 Library General Public License as
+published by the Free Software Foundation; either version 2 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include <asm/resource.h>
+
+/* Transmute defines to enumerations.  The macro re-definitions are
+   necessary because some programs want to test for operating system
+   features with #ifdef RUSAGE_SELF.  In ISO C the reflexive
+   definition is a no-op.  */
+
+/* Kinds of resource limit.  */
+enum __rlimit_resource
+{
+  /* Per-process CPU limit, in seconds.  */
+  _RLIMIT_CPU = RLIMIT_CPU,
+#undef RLIMIT_CPU
+  RLIMIT_CPU = _RLIMIT_CPU,
+#define RLIMIT_CPU RLIMIT_CPU
+
+  /* Largest file that can be created, in bytes.  */
+  _RLIMIT_FSIZE = RLIMIT_FSIZE,
+#undef RLIMIT_FSIZE
+  RLIMIT_FSIZE = _RLIMIT_FSIZE,
+#define	RLIMIT_FSIZE RLIMIT_FSIZE
+
+  /* Maximum size of data segment, in bytes.  */
+  _RLIMIT_DATA = RLIMIT_DATA,
+#undef RLIMIT_DATA
+  RLIMIT_DATA = _RLIMIT_DATA,
+#define	RLIMIT_DATA RLIMIT_DATA
+
+  /* Maximum size of stack segment, in bytes.  */
+  _RLIMIT_STACK = RLIMIT_STACK,
+#undef RLIMIT_STACK
+  RLIMIT_STACK = _RLIMIT_STACK,
+#define	RLIMIT_STACK RLIMIT_STACK
+
+  /* Largest core file that can be created, in bytes.  */
+  _RLIMIT_CORE = RLIMIT_CORE,
+#undef RLIMIT_CORE
+  RLIMIT_CORE = _RLIMIT_CORE,
+#define	RLIMIT_CORE RLIMIT_CORE
+
+  /* Largest resident set size, in bytes.
+     This affects swapping; processes that are exceeding their
+     resident set size will be more likely to have physical memory
+     taken from them.  */
+  _RLIMIT_RSS = RLIMIT_RSS,
+#undef RLIMIT_RSS
+  RLIMIT_RSS = _RLIMIT_RSS,
+#define	RLIMIT_RSS RLIMIT_RSS
+
+  /* Number of open files.  */
+  _RLIMIT_NOFILE = RLIMIT_NOFILE,
+#undef RLIMIT_NOFILE
+  RLIMIT_NOFILE = _RLIMIT_NOFILE,
+  RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same.  */
+#define RLIMIT_NOFILE RLIMIT_NOFILE
+#define RLIMIT_OFILE RLIMIT_OFILE
+
+  /* Address space limit (?) */
+  _RLIMIT_AS = RLIMIT_AS,
+#undef RLIMIT_AS
+  RLIMIT_AS = _RLIMIT_AS,
+#define RLIMIT_AS RLIMIT_AS
+
+  /* Number of processes.  */
+  _RLIMIT_NPROC = RLIMIT_NPROC,
+#undef RLIMIT_NPROC
+  RLIMIT_NPROC = _RLIMIT_NPROC,
+#define RLIMIT_NPROC RLIMIT_NPROC
+
+  /* Locked-in-memory address space.  */
+  _RLIMIT_MEMLOCK = RLIMIT_MEMLOCK,
+#undef RLIMIT_MEMLOCK
+  RLIMIT_MEMLOCK = _RLIMIT_MEMLOCK,
+#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK
+
+  RLIMIT_NLIMITS = RLIM_NLIMITS,
+#undef RLIM_NLIMITS
+  RLIM_NLIMITS = RLIMIT_NLIMITS,
+#define RLIMIT_NLIMITS RLIMIT_NLIMITS
+#define RLIM_NLIMITS RLIM_NLIMITS
+
+  /* Value to indicate that there is no limit.  */
+  RLIM_INFINITY = (long int)(~0UL >> 1)
+#define RLIM_INFINITY RLIM_INFINITY
+};
+
+struct rlimit
+{
+  /* The current (soft) limit.  */
+  long int rlim_cur;
+  /* The hard limit.  */
+  long int rlim_max;
+};
+
+/* Whose usage statistics do you want?  */
+enum __rusage_who
+{
+  /* The calling process.  */
+  RUSAGE_SELF = 0,
+#define RUSAGE_SELF RUSAGE_SELF
+
+  /* All of its terminated child processes.  */
+  RUSAGE_CHILDREN = -1,
+#define RUSAGE_CHILDREN RUSAGE_CHILDREN
+
+  /* Both.  */
+  RUSAGE_BOTH = -2
+#define RUSAGE_BOTH RUSAGE_BOTH
+};
+
+#include <sys/time.h>		/* For `struct timeval'.  */
+
+/* Structure which says how much of each resource has been used.  */
+struct rusage
+{
+  /* Total amount of user time used.  */
+  struct timeval ru_utime;
+  /* Total amount of system time used.  */
+  struct timeval ru_stime;
+  /* Maximum resident set size (in kilobytes).  */
+  long int ru_maxrss;
+  /* Amount of sharing of text segment memory
+     with other processes (kilobyte-seconds).  */
+  long int ru_ixrss;
+  /* Amount of data segment memory used (kilobyte-seconds).  */
+  long int ru_idrss;
+  /* Amount of stack memory used (kilobyte-seconds).  */
+  long int ru_isrss;
+  /* Number of soft page faults (i.e. those serviced by reclaiming
+     a page from the list of pages awaiting reallocation.  */
+  long int ru_minflt;
+  /* Number of hard page faults (i.e. those that required I/O).  */
+  long int ru_majflt;
+  /* Number of times a process was swapped out of physical memory.  */
+  long int ru_nswap;
+  /* Number of input operations via the file system.  Note: This
+     and `ru_oublock' do not include operations with the cache.  */
+  long int ru_inblock;
+  /* Number of output operations via the file system.  */
+  long int ru_oublock;
+  /* Number of IPC messages sent.  */
+  long int ru_msgsnd;
+  /* Number of IPC messages received.  */
+  long int ru_msgrcv;
+  /* Number of signals delivered.  */
+  long int ru_nsignals;
+  /* Number of voluntary context switches, i.e. because the process
+     gave up the process before it had to (usually to wait for some
+     resource to be available).  */
+  long int ru_nvcsw;
+  /* Number of involuntary context switches, i.e. a higher priority process
+     became runnable or the current process used up its time slice.  */
+  long int ru_nivcsw;
+};
+
+/* Priority limits.  */
+#define PRIO_MIN	-20	/* Minimum priority a process can have.  */
+#define PRIO_MAX	20	/* Maximum priority a process can have.  */
+
+/* The type of the WHICH argument to `getpriority' and `setpriority',
+   indicating what flavor of entity the WHO argument specifies.  */
+enum __priority_which
+{
+  PRIO_PROCESS = 0,		/* WHO is a process ID.  */
+  PRIO_PGRP = 1,		/* WHO is a process group ID.  */
+  PRIO_USER = 2			/* WHO is a user ID.  */
+};
diff --git a/sysdeps/unix/sysv/linux/timebits.h b/sysdeps/unix/sysv/linux/timebits.h
index b5eaec91b0..8aed9e94df 100644
--- a/sysdeps/unix/sysv/linux/timebits.h
+++ b/sysdeps/unix/sysv/linux/timebits.h
@@ -1,21 +1,36 @@
 /* System-dependent timing definitions.  Linux version.
-Copyright (C) 1996 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 Library General Public License as
-published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1996 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 Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifdef __need_timeval
+# undef __need_timeval
+# ifndef _STRUCT_TIMEVAL
+#  define _STRUCT_TIMEVAL	1
+/* A time value that is accurate to the nearest
+   microsecond but also has a range of years.  */
+struct timeval
+  {
+    time_t tv_sec;		/* Seconds.  */
+    time_t tv_usec;		/* Microseconds.  */
+  };
+# endif	/* struct timeval */
+#endif	/* need timeval */
+
 
 #ifndef _TIMEBITS_H
 #define	_TIMEBITS_H	1