diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-08-14 22:14:28 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-18 02:37:16 -0400 |
| commit | 352d0eafb669a688003471783ca43cf5a3e94cd2 (patch) | |
| tree | 3acf88fdac8f2ed02d4d3684e18971be2c03705c | |
| parent | 55b14dda4375b7b8f80f09a791bdf3cf7e0f3e08 (diff) | |
| download | glibc-352d0eafb669a688003471783ca43cf5a3e94cd2.tar.gz glibc-352d0eafb669a688003471783ca43cf5a3e94cd2.tar.xz glibc-352d0eafb669a688003471783ca43cf5a3e94cd2.zip | |
hppa: timerfd.h: move to common sys/timerfd.h
Use the common sys/timerfd.h to avoid duplication and move the arch-specific settings into bits/timerfd.h.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/bits/timerfd.h (renamed from sysdeps/unix/sysv/linux/hppa/sys/timerfd.h) | 36 |
2 files changed, 8 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog index 1212089138..13fccc0dc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-08-18 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/hppa/bits/timerfd.h: New file. + * sysdeps/unix/sysv/linux/hppa/sys/timerfd.h: Delete. + +2015-08-18 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/hppa/bits/signalfd.h: New file. * sysdeps/unix/sysv/linux/hppa/sys/signalfd.h: Delete. diff --git a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h index aa59dcd475..aba0b32016 100644 --- a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h @@ -12,14 +12,12 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see + License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _SYS_TIMERFD_H -#define _SYS_TIMERFD_H 1 - -#include <time.h> - +# error "Never use <bits/timerfd.h> directly; include <sys/timerfd.h> instead." +#endif /* Bits to be set in the FLAGS parameter of `timerfd_create'. */ enum @@ -29,31 +27,3 @@ enum TFD_NONBLOCK = 000200004 /* HPUX has separate NDELAY & NONBLOCK */ #define TFD_NONBLOCK TFD_NONBLOCK }; - - -/* Bits to be set in the FLAGS parameter of `timerfd_settime'. */ -enum - { - TFD_TIMER_ABSTIME = 1 << 0 -#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME - }; - - -__BEGIN_DECLS - -/* Return file descriptor for new interval timer source. */ -extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; - -/* Set next expiration time of interval timer source UFD to UTMR. If - FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is - absolute. Optionally return the old expiration time in OTMR. */ -extern int timerfd_settime (int __ufd, int __flags, - const struct itimerspec *__utmr, - struct itimerspec *__otmr) __THROW; - -/* Return the next expiration time of UFD. */ -extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW; - -__END_DECLS - -#endif /* sys/timerfd.h */ |