about summary refs log tree commit diff
path: root/rtkaio
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-12-12 23:01:37 +0000
committerJakub Jelinek <jakub@redhat.com>2007-12-12 23:01:37 +0000
commitc5899b63ebb80de72b909a475e1dd41b99a4080c (patch)
treecca8a316f938c282801963c9815852dd888cab83 /rtkaio
parent1716edfc192b29f8cec407e3eebfbe84e28f70e4 (diff)
downloadglibc-c5899b63ebb80de72b909a475e1dd41b99a4080c.tar.gz
glibc-c5899b63ebb80de72b909a475e1dd41b99a4080c.tar.xz
glibc-c5899b63ebb80de72b909a475e1dd41b99a4080c.zip
* sysdeps/unix/sysv/linux/kaio_read.c (aio_read64): Define to cvs/fedora-glibc-2_7_90-1
	something else while including kaio_misc.h.
	* sysdeps/unix/sysv/linux/kaio_write.c (aio_write64): Likewise.
Diffstat (limited to 'rtkaio')
-rw-r--r--rtkaio/ChangeLog6
-rw-r--r--rtkaio/sysdeps/unix/sysv/linux/kaio_read.c2
-rw-r--r--rtkaio/sysdeps/unix/sysv/linux/kaio_write.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/rtkaio/ChangeLog b/rtkaio/ChangeLog
index f6ae2533e1..2cfe6bd1c6 100644
--- a/rtkaio/ChangeLog
+++ b/rtkaio/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/kaio_read.c (aio_read64): Define to
+	something else while including kaio_misc.h.
+	* sysdeps/unix/sysv/linux/kaio_write.c (aio_write64): Likewise.
+
 2007-08-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/kaio_misc.h (AIO_MISC_NOTIFY,
diff --git a/rtkaio/sysdeps/unix/sysv/linux/kaio_read.c b/rtkaio/sysdeps/unix/sysv/linux/kaio_read.c
index 0c5db34879..8d25433cee 100644
--- a/rtkaio/sysdeps/unix/sysv/linux/kaio_read.c
+++ b/rtkaio/sysdeps/unix/sysv/linux/kaio_read.c
@@ -1,2 +1,4 @@
+#define aio_read64 __renamed_aio_read64
 #include <kaio_misc.h>
+#undef aio_read64
 #include <aio_read.c>
diff --git a/rtkaio/sysdeps/unix/sysv/linux/kaio_write.c b/rtkaio/sysdeps/unix/sysv/linux/kaio_write.c
index 96863b2cdd..5bfeb3bfcc 100644
--- a/rtkaio/sysdeps/unix/sysv/linux/kaio_write.c
+++ b/rtkaio/sysdeps/unix/sysv/linux/kaio_write.c
@@ -1,2 +1,4 @@
+#define aio_write64 __renamed_aio_write64
 #include <kaio_misc.h>
+#undef aio_write64
 #include <aio_write.c>