You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by be...@hyperreal.org on 1999/08/18 17:54:19 UTC
cvs commit: apache-2.0/mpm/src/lib/apr/network_io/unix poll.c
ben 99/08/18 08:54:19
Modified: mpm/src/lib/apr config.status
mpm/src/lib/apr/include apr_config.h
mpm/src/lib/apr/network_io/unix poll.c
Log:
Use sys/time.h to get timeval. Correct typo.
Revision Changes Path
1.3 +57 -95 apache-2.0/mpm/src/lib/apr/Attic/config.status
1.3 +13 -10 apache-2.0/mpm/src/lib/apr/include/Attic/apr_config.h
1.3 +6 -3 apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poll.c 1999/08/18 13:33:28 1.2
+++ poll.c 1999/08/18 15:54:18 1.3
@@ -60,6 +60,9 @@
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
#ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
@@ -396,13 +399,13 @@
ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset,
struct socket_t *sock, ap_int16_t events)
{
- if (event & APR_POLLIN) {
+ if (events & APR_POLLIN) {
FD_CLR(sock->socketdes, aprset->read);
}
- if (event & APR_POLLPRI) {
+ if (events & APR_POLLPRI) {
FD_CLR(sock->socketdes, aprset->read);
}
- if (event & APR_POLLOUT) {
+ if (events & APR_POLLOUT) {
FD_CLR(sock->socketdes, aprset->write);
}
return APR_SUCCESS;
Re: cvs commit: apache-2.0/mpm/src/lib/apr/network_io/unix poll.c
Posted by Ben Laurie <be...@algroup.co.uk>.
Ryan Bloom wrote:
>
> Thanks Ben,
>
> David Reid told me about that typo last week, but I have just continued to
> forget about fixing it. I am surprised I didn't get an error when I
> compiled on a freeBSD box, but maybe I am using too new a version of
> FreeBSD.
I believe the most recent FreeBSDs support poll(). The particular box
I'm using is 2.2.8.
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Gandhi
Re: cvs commit: apache-2.0/mpm/src/lib/apr/network_io/unix poll.c
Posted by Ryan Bloom <rb...@raleigh.ibm.com>.
Thanks Ben,
David Reid told me about that typo last week, but I have just continued to
forget about fixing it. I am surprised I didn't get an error when I
compiled on a freeBSD box, but maybe I am using too new a version of
FreeBSD.
Ryan
On 18 Aug 1999 ben@hyperreal.org wrote:
> ben 99/08/18 08:54:19
>
> Modified: mpm/src/lib/apr config.status
> mpm/src/lib/apr/include apr_config.h
> mpm/src/lib/apr/network_io/unix poll.c
> Log:
> Use sys/time.h to get timeval. Correct typo.
>
> Revision Changes Path
> 1.3 +57 -95 apache-2.0/mpm/src/lib/apr/Attic/config.status
>
>
>
>
> 1.3 +13 -10 apache-2.0/mpm/src/lib/apr/include/Attic/apr_config.h
>
>
>
>
> 1.3 +6 -3 apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c
>
> Index: poll.c
> ===================================================================
> RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- poll.c 1999/08/18 13:33:28 1.2
> +++ poll.c 1999/08/18 15:54:18 1.3
> @@ -60,6 +60,9 @@
> #ifdef HAVE_ERRNO_H
> #include <errno.h>
> #endif
> +#ifdef HAVE_SYS_TIME_H
> +#include <sys/time.h>
> +#endif
>
> #ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
>
> @@ -396,13 +399,13 @@
> ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset,
> struct socket_t *sock, ap_int16_t events)
> {
> - if (event & APR_POLLIN) {
> + if (events & APR_POLLIN) {
> FD_CLR(sock->socketdes, aprset->read);
> }
> - if (event & APR_POLLPRI) {
> + if (events & APR_POLLPRI) {
> FD_CLR(sock->socketdes, aprset->read);
> }
> - if (event & APR_POLLOUT) {
> + if (events & APR_POLLOUT) {
> FD_CLR(sock->socketdes, aprset->write);
> }
> return APR_SUCCESS;
>
>
>
>
_______________________________________________________________________
Ryan Bloom rbb@raleigh.ibm.com
4205 S Miami Blvd
RTP, NC 27709 It's a beautiful sight to see good dancers
doing simple steps. It's a painful sight to
see beginners doing complicated patterns.