From 578cd27008df53f87c1a4b3dbda8da94650205c3 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 May 2012 16:02:21 -0700 Subject: Use x86_64 bits/epoll.h for both i386 and x86_64 --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/x86/bits/epoll.h | 31 +++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/bits/epoll.h | 31 ----------------------------- 3 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/x86/bits/epoll.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/bits/epoll.h diff --git a/ChangeLog b/ChangeLog index 039df439fa..8a16ab16a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2012-05-31 H.J. Lu [BZ #14117] + * sysdeps/unix/sysv/linux/x86_64/bits/epoll.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/bits/epoll.h: This. + * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Removed. * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Renamed to ... * sysdeps/unix/sysv/linux/x86/bits/fcntl.h: This. diff --git a/sysdeps/unix/sysv/linux/x86/bits/epoll.h b/sysdeps/unix/sysv/linux/x86/bits/epoll.h new file mode 100644 index 0000000000..be1f5a636f --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/bits/epoll.h @@ -0,0 +1,31 @@ +/* Copyright (C) 2002-2012 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 + 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 + . */ + +#ifndef _SYS_EPOLL_H +# error "Never use directly; include instead." +#endif + +/* Flags to be passed to epoll_create1. */ +enum + { + EPOLL_CLOEXEC = 02000000, +#define EPOLL_CLOEXEC EPOLL_CLOEXEC + EPOLL_NONBLOCK = 00004000 +#define EPOLL_NONBLOCK EPOLL_NONBLOCK + }; + +#define __EPOLL_PACKED __attribute__ ((__packed__)) diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/epoll.h b/sysdeps/unix/sysv/linux/x86_64/bits/epoll.h deleted file mode 100644 index be1f5a636f..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/bits/epoll.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 2002-2012 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 - 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 - . */ - -#ifndef _SYS_EPOLL_H -# error "Never use directly; include instead." -#endif - -/* Flags to be passed to epoll_create1. */ -enum - { - EPOLL_CLOEXEC = 02000000, -#define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 00004000 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK - }; - -#define __EPOLL_PACKED __attribute__ ((__packed__)) -- cgit 1.4.1