From 4eaae765170c09ba7738de0c7617b8847ae0ab82 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 14 May 2014 10:43:54 -0700 Subject: Move x86_64 compat-timer.h out of nptl/ --- ChangeLog | 2 + nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h | 45 ---------------------- sysdeps/unix/sysv/linux/x86_64/compat-timer.h | 45 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h create mode 100644 sysdeps/unix/sysv/linux/x86_64/compat-timer.h diff --git a/ChangeLog b/ChangeLog index 9b48373..515cdc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-05-14 Roland McGrath + * nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h: Moved ... + * sysdeps/unix/sysv/linux/x86_64/compat-timer.h: ... here. * nptl/sysdeps/unix/sysv/linux/x86_64/Versions: Remove, merge into ... * sysdeps/unix/sysv/linux/x86_64/Versions: ... here. * nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c: Moved ... diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h b/nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h deleted file mode 100644 index 2cb19bc..0000000 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2003. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 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 - 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; see the file COPYING.LIB. If - not, see . */ - -#include -#include -#include - -#define OLD_TIMER_MAX 256 - -extern timer_t __compat_timer_list[OLD_TIMER_MAX] attribute_hidden; - - -extern int __timer_create_new (clockid_t clock_id, struct sigevent *evp, - timer_t *timerid); -extern int __timer_delete_new (timer_t timerid); -extern int __timer_getoverrun_new (timer_t timerid); -extern int __timer_gettime_new (timer_t timerid, struct itimerspec *value); -extern int __timer_settime_new (timer_t timerid, int flags, - const struct itimerspec *value, - struct itimerspec *ovalue); - - -extern int __timer_create_old (clockid_t clock_id, struct sigevent *evp, - int *timerid); -extern int __timer_delete_old (int timerid); -extern int __timer_getoverrun_old (int timerid); -extern int __timer_gettime_old (int timerid, struct itimerspec *value); -extern int __timer_settime_old (int timerid, int flags, - const struct itimerspec *value, - struct itimerspec *ovalue); diff --git a/sysdeps/unix/sysv/linux/x86_64/compat-timer.h b/sysdeps/unix/sysv/linux/x86_64/compat-timer.h new file mode 100644 index 0000000..2cb19bc --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/compat-timer.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2003-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 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 + 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; see the file COPYING.LIB. If + not, see . */ + +#include +#include +#include + +#define OLD_TIMER_MAX 256 + +extern timer_t __compat_timer_list[OLD_TIMER_MAX] attribute_hidden; + + +extern int __timer_create_new (clockid_t clock_id, struct sigevent *evp, + timer_t *timerid); +extern int __timer_delete_new (timer_t timerid); +extern int __timer_getoverrun_new (timer_t timerid); +extern int __timer_gettime_new (timer_t timerid, struct itimerspec *value); +extern int __timer_settime_new (timer_t timerid, int flags, + const struct itimerspec *value, + struct itimerspec *ovalue); + + +extern int __timer_create_old (clockid_t clock_id, struct sigevent *evp, + int *timerid); +extern int __timer_delete_old (int timerid); +extern int __timer_getoverrun_old (int timerid); +extern int __timer_gettime_old (int timerid, struct itimerspec *value); +extern int __timer_settime_old (int timerid, int flags, + const struct itimerspec *value, + struct itimerspec *ovalue); -- cgit v1.1