about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/generic
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-14 11:06:36 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-14 11:06:36 -0700
commit2fbdf5339aaeaa423bd661524f7ec7af41fa2606 (patch)
tree53cba09f7e726fe4b83b289213bf1d387cb024c5 /sysdeps/unix/sysv/linux/generic
parent4ef6befaf5e768863d2f70c7b15a283d819c7c99 (diff)
downloadglibc-2fbdf5339aaeaa423bd661524f7ec7af41fa2606.tar.gz
glibc-2fbdf5339aaeaa423bd661524f7ec7af41fa2606.tar.xz
glibc-2fbdf5339aaeaa423bd661524f7ec7af41fa2606.zip
Consolidate not-cancel.h files.
Diffstat (limited to 'sysdeps/unix/sysv/linux/generic')
-rw-r--r--sysdeps/unix/sysv/linux/generic/not-cancel.h34
-rw-r--r--sysdeps/unix/sysv/linux/generic/nptl/not-cancel.h1
2 files changed, 0 insertions, 35 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/not-cancel.h b/sysdeps/unix/sysv/linux/generic/not-cancel.h
deleted file mode 100644
index b8df253607..0000000000
--- a/sysdeps/unix/sysv/linux/generic/not-cancel.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Uncancelable versions of cancelable interfaces.  Linux asm-generic version.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2012.
-
-   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.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LINUX_GENERIC_NOT_CANCEL_H
-#define _LINUX_GENERIC_NOT_CANCEL_H
-
-#include <sysdeps/unix/sysv/linux/not-cancel.h>
-#include <fcntl.h>
-
-/* Uncancelable open with openat.  */
-#undef open_not_cancel
-#define open_not_cancel(name, flags, mode) \
-  INLINE_SYSCALL (openat, 4, AT_FDCWD, (const char *) (name), (flags), (mode))
-#undef open_not_cancel_2
-#define open_not_cancel_2(name, flags) \
-  INLINE_SYSCALL (openat, 3, AT_FDCWD, (const char *) (name), (flags))
-
-#endif
diff --git a/sysdeps/unix/sysv/linux/generic/nptl/not-cancel.h b/sysdeps/unix/sysv/linux/generic/nptl/not-cancel.h
deleted file mode 100644
index e6a0d135c8..0000000000
--- a/sysdeps/unix/sysv/linux/generic/nptl/not-cancel.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <nptl/sysdeps/unix/sysv/linux/i386/not-cancel.h>