From: Uwe Hermann <redacted>
Date: Wed, 2 Feb 2011 12:13:13 +0000 (+0100)
Subject: MinGW: Build fixes.
X-Git-Tag: libsigrok-0.1.0~350
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=a9f54bcd7b83baf465e5096f604470cacb4951bf;hp=22b02383442ec55a11cc6dd2b4c467d1de0b5bd2;p=libsigrok.git

MinGW: Build fixes.
---

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index f6efe3e2..5205c188 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #ifdef _WIN32
-#include <conio.h>
+#include <windows.h>
 #else
 #include <glob.h>
 #include <termios.h>
diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 9ebd6b09..dd1fbdb2 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -24,7 +24,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <termios.h>
 #endif
 #include <string.h>