[PATCH] trivial fixes for WIN32

I'm trying to compile today's CVS HEAD of beepcore-c on
Microsoft Windows.  Here are two rather obvious patches
that avoid compiler errors in the beepcore library.
I haven't compiled the other parts yet, so I don't know
whether the thing actually runs.

Index: threaded_os/transport/bp_fiostate.c
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/threaded_os/transport/bp_fiostate.c,v
retrieving revision 1.16
diff -u -p -r1.16 bp_fiostate.c
--- threaded_os/transport/bp_fiostate.c	2 Aug 2002 15:08:32 -0000	1.16
+++ threaded_os/transport/bp_fiostate.c	7 Oct 2004 07:49:35 -0000
@@ -622,7 +622,7 @@ int blw_primary_reader(void *fd,char *bu
 #ifdef WIN32
     if (ret == SOCKET_ERROR) {
         int err = WSAGetLastError();
-        ASSERT(err == WSAEWOULDBLOCK || err == WSAECONNABORTED !! err == WSAECONNRESET);
+        ASSERT(err == WSAEWOULDBLOCK || err == WSAECONNABORTED || err == WSAECONNRESET);
     }
 #endif
 
Index: threaded_os/transport/bp_fiostate.h
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/threaded_os/transport/bp_fiostate.h,v
retrieving revision 1.9
diff -u -p -r1.9 bp_fiostate.h
--- threaded_os/transport/bp_fiostate.h	2 Aug 2002 15:08:32 -0000	1.9
+++ threaded_os/transport/bp_fiostate.h	7 Oct 2004 07:49:35 -0000
@@ -99,7 +99,7 @@ struct _io_state
     POLL_NODE *pn;
     unsigned int iostate_index;
     struct _wrapper* wrapper;
-#ifdef HAVE_POLL
+#ifndef HAVE_POLL
     /* read and write are enabled/disabled by setting the event flags */
     int events;
 #endif



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl