From 6ee68fa294d1d9ab8fa8e61a009845dc31a9b771 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 14 Feb 2017 11:53:25 +0100
Subject: Compiles on MXE, but not working on Windows

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 include/device.h | 2 +-
 include/log.h    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/device.h b/include/device.h
index a23e1b3..281c4d9 100644
--- a/include/device.h
+++ b/include/device.h
@@ -1,7 +1,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 #include <chrono>
-#include <hidapi/hidapi.h>
+#include "hidapi/hidapi.h"
 #include <cstdint>
 #include <string>
 
diff --git a/include/log.h b/include/log.h
index 8eda4fb..0b0df8c 100644
--- a/include/log.h
+++ b/include/log.h
@@ -6,6 +6,10 @@
 namespace nitrokey {
 namespace log {
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 enum class Loglevel : int { DEBUG_L2, DEBUG, INFO, WARNING, ERROR };
 
 class LogHandler {
-- 
cgit v1.2.1