about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:02:21 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:02:21 -0700
commit578cd27008df53f87c1a4b3dbda8da94650205c3 (patch)
treeb2a07ccf19d912fa4c6a1512b1985ddcc01ea8be
parentde662f5f19b0ca81e285832252d5ca95657e92bd (diff)
downloadglibc-578cd27008df53f87c1a4b3dbda8da94650205c3.tar.gz
glibc-578cd27008df53f87c1a4b3dbda8da94650205c3.tar.xz
glibc-578cd27008df53f87c1a4b3dbda8da94650205c3.zip
Use x86_64 bits/epoll.h for both i386 and x86_64
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/epoll.h (renamed from sysdeps/unix/sysv/linux/x86_64/bits/epoll.h)0
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 039df439fa..8a16ab16a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[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_64/bits/epoll.h b/sysdeps/unix/sysv/linux/x86/bits/epoll.h
index be1f5a636f..be1f5a636f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/epoll.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/epoll.h