README: Remove note about old MinGW, it actually works fine.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index eee453a276155d667a1a32894c62788891bc42aa..72010913ae4e7a2cc4772112afc857350e7a37f0 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -1307,6 +1307,11 @@ SP_API enum sp_return sp_output_waiting(struct sp_port *port)
 {
        TRACE("%p", port);
 
+#ifdef __CYGWIN__
+       /* TIOCOUTQ is not defined in Cygwin headers */
+       RETURN_ERROR(SP_ERR_SUPP,
+                       "Getting output bytes waiting is not supported on Cygwin");
+#else
        CHECK_OPEN_PORT();
 
        DEBUG_FMT("Checking output bytes waiting on port %s", port->name);
@@ -1324,6 +1329,7 @@ SP_API enum sp_return sp_output_waiting(struct sp_port *port)
                RETURN_FAIL("TIOCOUTQ ioctl failed");
        RETURN_INT(bytes_waiting);
 #endif
+#endif
 }
 
 SP_API enum sp_return sp_new_event_set(struct sp_event_set **result_ptr)
@@ -1442,6 +1448,7 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
        RETURN_OK();
 #else
        struct timeout timeout;
+       int poll_timeout;
        int result;
        struct pollfd *pollfds;
        unsigned int i;
@@ -1472,7 +1479,11 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
                        break;
                }
 
-               result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
+               poll_timeout = (int) timeout_remaining_ms(&timeout);
+               if (poll_timeout == 0)
+                       poll_timeout = -1;
+
+               result = poll(pollfds, event_set->count, poll_timeout);
 
                timeout_update(&timeout);
 
@@ -1838,6 +1849,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
        DEBUG_FMT("Setting configuration for port %s", port->name);
 
 #ifdef _WIN32
+       BYTE* new_buf;
 
        TRY(await_write_completion(port));
 
@@ -1854,11 +1866,10 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
                /* Allocate write buffer for 50ms of data at baud rate. */
                port->write_buf_size = max(config->baudrate / (8 * 20), 1);
-               port->write_buf = realloc(port->write_buf,
-                                         port->write_buf_size);
-
-               if (!port->write_buf)
+               new_buf = realloc(port->write_buf, port->write_buf_size);
+               if (!new_buf)
                        RETURN_ERROR(SP_ERR_MEM, "Allocating write buffer failed");
+               port->write_buf = new_buf;
        }
 
        if (config->bits >= 0)