Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 90632 invoked by uid 500); 2 Aug 2002 05:12:37 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 90621 invoked from network); 2 Aug 2002 05:12:36 -0000 Date: 2 Aug 2002 05:12:35 -0000 Message-ID: <20020802051235.64788.qmail@icarus.apache.org> From: brianp@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/poll/unix poll.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N brianp 2002/08/01 22:12:35 Modified: poll/unix poll.c Log: One more fix for socket/file incompatibility on win32 Revision Changes Path 1.15 +5 -1 apr/poll/unix/poll.c Index: poll.c =================================================================== RCS file: /home/cvs/apr/poll/unix/poll.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- poll.c 2 Aug 2002 05:07:16 -0000 1.14 +++ poll.c 2 Aug 2002 05:12:35 -0000 1.15 @@ -254,7 +254,7 @@ } else { #ifdef WIN32 - return EBADF; + return APR_EBADF; #else fd = aprset[i].desc.f->filedes; #endif @@ -351,7 +351,11 @@ fd = descriptor->desc.s->socketdes; } else { +#ifdef WIN32 + return APR_EBADF; +#else fd = descriptor->desc.f->filedes; +#endif } if (descriptor->reqevents & APR_POLLIN) { FD_SET(fd, &(pollset->readset));