X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=dd07466cef2623e5aaa053178d7eda9e992e3dcd;hp=b913009369ba6029fcdf4fa8378c9d926e30dd10;hb=b564291f5f15b5bd4a319ea59875023551a705cc;hpb=27638103f249ffbe9768603b9baff199950fd9f6

diff --git a/fd.c b/fd.c
index b9130093..dd07466c 100644
--- a/fd.c
+++ b/fd.c
@@ -47,8 +47,8 @@ int file_exists(const char *fn)
  * \param n the highest-numbered descriptor in any of the two sets, plus 1
  * \param readfds fds that should be checked for readability
  * \param writefds fds that should be checked for writablility
- * \param timeout upper bound on the amount of time elapsed before select()
- *  returns
+ * \param timeout_tv upper bound on the amount of time elapsed before select()
+ * returns
  *
  * \return The return value of the underlying select() call.
  *
@@ -56,11 +56,11 @@ int file_exists(const char *fn)
  * \sa select(2) select_tut(2)
  */
 int para_select(int n, fd_set *readfds, fd_set *writefds,
-		struct timeval *timeout)
+		struct timeval *timeout_tv)
 {
 	int ret, err;
 	do {
-		ret = select(n, readfds, writefds, NULL, timeout);
+		ret = select(n, readfds, writefds, NULL, timeout_tv);
 		err = errno;
 	} while (ret < 0 && err == EINTR);
 	if (ret < 0)