serial: On Windows, include <windows.h> for HANDLE

[libsigrok.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index 6d33b3bf9f9e543dbed815cccae6a5ad8ec77b1d..b0ae07f083503ee5a615627528fdb467c223cbb6 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,8 +25,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#ifdef G_OS_WIN32
+#include <windows.h> /* for HANDLE */
+#endif
 
 /** @cond PRIVATE */
 #define LOG_PREFIX "serial"
@@ -693,7 +696,7 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
        }
 
        /* Assume 8n1 transmission. That is 10 bits for every byte. */
-       byte_delay_us = 10 * (1000000 / baudrate);
+       byte_delay_us = 10 * ((1000 * 1000) / baudrate);
        start = g_get_monotonic_time();
 
        i = ibuf = len = 0;
@@ -784,7 +787,7 @@ SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_devic
 }
 
 /** @cond PRIVATE */
-#ifdef _WIN32
+#ifdef G_OS_WIN32
 typedef HANDLE event_handle;
 #else
 typedef int event_handle;
@@ -814,12 +817,12 @@ SR_PRIV int serial_source_add(struct sr_session *session,
                return SR_ERR;
        }
 
-       serial->pollfds = (GPollFD *) g_malloc0(sizeof(GPollFD) * serial->event_set->count);
+       serial->pollfds = g_new0(GPollFD, serial->event_set->count);
 
        for (i = 0; i < serial->event_set->count; i++) {
 
-               serial->pollfds[i].fd = ((event_handle *) serial->event_set->handles)[i];
-
+               serial->pollfds[i].fd = (gintptr)
+                       ((event_handle *)serial->event_set->handles)[i];
                mask = serial->event_set->masks[i];
 
                if (mask & SP_EVENT_RX_READY)
@@ -843,6 +846,9 @@ SR_PRIV int serial_source_remove(struct sr_session *session,
 {
        unsigned int i;
 
+       if (!serial->event_set)
+               return SR_OK;
+
        for (i = 0; i < serial->event_set->count; i++)
                if (sr_session_source_remove_pollfd(session, &serial->pollfds[i]) != SR_OK)
                        return SR_ERR;