databases/mysql56-client/patches/patch-vio_viosocket.c

   1 $NetBSD$
   2
   3 --- vio/viosocket.c.orig        2013-04-28 13:51:01.000000000 +0000
   4 +++ vio/viosocket.c
   5 @@ -854,16 +854,16 @@ int vio_io_wait(Vio *vio, enum enum_vio_
   6    switch (event)
   7    {
   8    case VIO_IO_EVENT_READ:
   9 -    ret= test(FD_ISSET(fd, &readfds));
  10 +    ret= my_test(FD_ISSET(fd, &readfds));
  11      break;
  12    case VIO_IO_EVENT_WRITE:
  13    case VIO_IO_EVENT_CONNECT:
  14 -    ret= test(FD_ISSET(fd, &writefds));
  15 +    ret= my_test(FD_ISSET(fd, &writefds));
  16      break;
  17    }
  18
  19    /* Error conditions pending? */
  20 -  ret|= test(FD_ISSET(fd, &exceptfds));
  21 +  ret|= my_test(FD_ISSET(fd, &exceptfds));
  22
  23    /* Not a timeout, ensure that a condition was met. */
  24    DBUG_ASSERT(ret);
  25 @@ -946,7 +946,7 @@ vio_socket_connect(Vio *vio, struct sock
  26  #else
  27        errno= error;
  28  #endif
  29 -      ret= test(error);
  30 +      ret= my_test(error);
  31      }
  32    }
  33
  34 @@ -957,7 +957,7 @@ vio_socket_connect(Vio *vio, struct sock
  35        DBUG_RETURN(TRUE);
  36    }
  37
  38 -  DBUG_RETURN(test(ret));
  39 +  DBUG_RETURN(my_test(ret));
  40  }
  41
  42