1998-10-12 Roland McGrath <roland@baalperazim.frob.com>

* sysdeps/generic/glob.c: #undef mempcpy before #define.

	* sysdeps/unix/bsd/clock.c: Use prototype defns.
This commit is contained in:
Roland McGrath 1998-10-12 09:21:56 +00:00
parent 1f5d369d43
commit 4875f665fa
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,9 @@
1998-10-12 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/generic/glob.c: #undef mempcpy before #define.
* sysdeps/unix/bsd/clock.c: Use prototype defns.
1998-10-11 Ulrich Drepper <drepper@cygnus.com>
* Rules [posix in sysdirs]: Set L_tmpnam to 20.

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1991, 1997, 1998 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
@ -24,8 +24,7 @@
__inline
#endif
static clock_t
timeval_to_clock_t (tv)
const struct timeval *tv;
timeval_to_clock_t (const struct timeval *tv)
{
return (clock_t) ((tv->tv_sec * CLK_TCK) +
(tv->tv_usec * CLK_TCK / 1000000));
@ -33,7 +32,7 @@ timeval_to_clock_t (tv)
/* Return the time used by the program so far (user time + system time). */
clock_t
clock ()
clock (void)
{
struct rusage usage;