Fix building on Cygwin.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 0a466887da1eddcbe72f642e007c0fb90417bdf1..eda2d19250fdcc7316b9f1f60ffa21ff4d37655f 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)
@@ -1838,6 +1844,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 +1861,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)
@@ -2478,17 +2484,17 @@ SP_API char *sp_last_error_message(void)
        TRACE_VOID();
 
 #ifdef _WIN32
-       TCHAR *message;
+       char *message;
        DWORD error = GetLastError();
 
-       DWORD length = FormatMessage(
+       DWORD length = FormatMessageA(
                FORMAT_MESSAGE_ALLOCATE_BUFFER |
                FORMAT_MESSAGE_FROM_SYSTEM |
                FORMAT_MESSAGE_IGNORE_INSERTS,
                NULL,
                error,
                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-               (LPTSTR) &message,
+               (LPSTR) &message,
                0, NULL );
 
        if (length >= 2 && message[length - 2] == '\r')