[Libsysio-commit] strided-io: libsysio/src rw.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11915/src

Modified Files:
      Tag: strided-io
	rw.c 
Log Message:


Need proper aliases for REDSTORM due to rewrite and integration of
{read,write}.c 

Much more lenient than before. No BSD support any longer and we always
want the GLIBC symbols, REDSTORM or no.


Index: rw.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/Attic/rw.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -b -B -p -r1.1.2.4 -r1.1.2.5
--- rw.c	27 Jan 2004 22:05:23 -0000	1.1.2.4
+++ rw.c	28 Jan 2004 04:49:35 -0000	1.1.2.5
@@ -310,9 +310,11 @@ readv(int fd, const struct iovec *iov, i
 	return _sysio_ioctx_wait(ioctx);
 }
 
-#if defined(BSD) || defined(REDSTORM)
-#undef _readv
-sysio_sym_weak_alias(readv, _readv)
+#if defined(__GLIBC__)
+#undef __readv
+sysio_sym_weak_alias(readv, __readv)
+#undef __libc_readv
+sysio_sym_weak_alias(readv, __libc_readv)
 #endif
 
 static void
@@ -411,11 +413,8 @@ read(int fd, void *buf, size_t count)
 #ifdef __GLIBC__
 #undef __read
 sysio_sym_weak_alias(read, __read)
-#endif
-
-#if defined(BSD) || defined(REDSTORM)
-#undef _read
-sysio_sym_weak_alias(read, _read)
+#undef __libc_read
+sysio_sym_weak_alias(read, __libc_read)
 #endif
 
 /*
@@ -648,6 +647,12 @@ _pread(int fd, void *buf, size_t count, 
 #if _LARGEFILE64_SOURCE
 #undef pread64
 sysio_sym_weak_alias(_pread, pread64)
+#if __GLIBC__
+#undef __pread64
+sysio_sym_weak_alias(_pread, __pread64)
+#undef __libc_pread64
+sysio_sym_weak_alias(_pread, __libc_pread64)
+#endif
 #endif
 
 ssize_t
@@ -657,6 +662,13 @@ pread(int fd, void *buf, size_t count, o
 	return _pread(fd, buf, count, offset);
 }
 
+#if __GLIBC__
+#undef _pread
+sysio_sym_weak_alias(pread, __pread)
+#undef __libc_pread
+sysio_sym_weak_alias(pread, __libc_pread)
+#endif
+
 static ioid_t
 _ireadx(int fd,
 	const struct iovec *iov, size_t iov_count,
@@ -749,7 +761,6 @@ ireadx(int fd,
 sysio_sym_weak_alias(_ireadx, ireadx)
 #endif
 
-#undef readx
 ssize_t
 readx(int fd,
       const struct iovec *iov, size_t iov_count,
@@ -860,9 +871,11 @@ writev(int fd, const struct iovec *iov, 
 	return _sysio_ioctx_wait(ioctx);
 }
 
-#if defined(BSD) || defined(REDSTORM)
-#undef _writev
-sysio_sym_weak_alias(writev, _writev)
+#ifdef __GLIBC__
+#undef __writev
+sysio_sym_weak_alias(writev, __writev)
+#undef __libc_writev
+sysio_sym_weak_alias(writev, __libc_writev)
 #endif
 
 ioid_t
@@ -953,11 +966,8 @@ write(int fd, const void *buf, size_t co
 #ifdef __GLIBC__
 #undef __write
 sysio_sym_weak_alias(write, __write)
-#endif
-
-#if defined(BSD) || defined(REDSTORM)
-#undef _write
-sysio_sym_weak_alias(write, _write)
+#undef __libc_write
+sysio_sym_weak_alias(write, __libc_write)
 #endif
 
 static ioid_t
@@ -1152,6 +1162,12 @@ _pwrite(int fd, const void *buf, size_t 
 #if _LARGEFILE64_SOURCE
 #undef pwrite64
 sysio_sym_weak_alias(_pwrite, pwrite64)
+#ifdef __GLIBC
+#undef __pwrite64
+sysio_sym_weak_alias(_pwrite, __pwrite64)
+#undef __libc_pwrite64
+sysio_sym_weak_alias(_pwrite, __libc_pwrite64)
+#endif
 #endif
 
 ssize_t
@@ -1161,6 +1177,11 @@ pwrite(int fd, const void *buf, size_t c
 	return _pwrite(fd, buf, count, offset);
 }
 
+#ifdef __GLIBC
+#undef __libc_pwrite
+sysio_sym_weak_alias(pwrite, __libc_pwrite)
+#endif
+
 static ioid_t
 _iwritex(int fd,
 	 const struct iovec *iov, size_t iov_count,