about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-10-12 09:21:56 +0000
committerRoland McGrath <roland@gnu.org>1998-10-12 09:21:56 +0000
commit4875f665fa4b02dfd7d16e73f203eb8acc3ae37f (patch)
tree260c886c7bbc3a8c359c7b29975a1b806f189d0c /sysdeps
parent1f5d369d43dc59b9aa243d1e9cc00ae41ea8ae56 (diff)
downloadglibc-4875f665fa4b02dfd7d16e73f203eb8acc3ae37f.tar.gz
glibc-4875f665fa4b02dfd7d16e73f203eb8acc3ae37f.tar.xz
glibc-4875f665fa4b02dfd7d16e73f203eb8acc3ae37f.zip
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.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/bsd/clock.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/bsd/clock.c b/sysdeps/unix/bsd/clock.c
index 349af61d80..962ddba505 100644
--- a/sysdeps/unix/bsd/clock.c
+++ b/sysdeps/unix/bsd/clock.c
@@ -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;