summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/ppoll.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-08-14 03:21:23 +0000
committerUlrich Drepper <drepper@redhat.com>2007-08-14 03:21:23 +0000
commit22502ea2a70d56057159b72d75f152ce2ccc1aec (patch)
tree91790983b742aef49e7650bf66b4da1f5701ba8c /sysdeps/unix/sysv/linux/ppoll.c
parent4baf59ada82537c87bae0a761ce43d334135f2e7 (diff)
downloadglibc-22502ea2a70d56057159b72d75f152ce2ccc1aec.tar.gz
glibc-22502ea2a70d56057159b72d75f152ce2ccc1aec.tar.xz
glibc-22502ea2a70d56057159b72d75f152ce2ccc1aec.zip
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PSELECT, cvs/fedora-glibc-20070814T0725 cvs/fedora-glibc-20070814T0643
	__ASSUME_PPOLL, __ASSUME_ATFCTS, __ASSUME_SET_ROBUST_LIST,
	__ASSUME_UTIMENSAT, __ASSUME_FALLOCATE): Update per-arch conditions
	when each feature was introduced.

	* sysdeps/unix/sysv/linux/dl-vdso.c: Don't include dl-hash.h.
	* sysdeps/unix/sysv/linux/dl-vdso.h: Don't include dl-hash.h if NDEBUG.
	(CHECK_HASH): New macro.
	(PREPARE_VERSION): Use it.

	* sysdeps/unix/sysv/linux/pselect.c (__generic_pselect): Only provide
	prototype if not __ASSUME_PSELECT.
	* sysdeps/unix/sysv/linux/ppoll.c (__generic_ppoll): Only provide
	prototype if not __ASSUME_PPOLL.

	* sysdeps/unix/sysv/linux/dl-osinfo.h (ROUND): #undef after use.

	* sysdeps/unix/clock_settime.c (freq, __pthread_clock_settime,
	hp_timing_settime): Don't define or declare if HANDLED_CPUTIME
	is defined.
Diffstat (limited to 'sysdeps/unix/sysv/linux/ppoll.c')
-rw-r--r--sysdeps/unix/sysv/linux/ppoll.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c
index cfc86ba806..14eb3111b9 100644
--- a/sysdeps/unix/sysv/linux/ppoll.c
+++ b/sysdeps/unix/sysv/linux/ppoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2006.
 
@@ -26,9 +26,11 @@
 
 
 #ifdef __NR_ppoll
+# ifndef __ASSUME_PPOLL
 static int __generic_ppoll (struct pollfd *fds, nfds_t nfds,
 			    const struct timespec *timeout,
 			    const sigset_t *sigmask);
+# endif
 
 
 int