diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-02-14 11:53:25 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:46 +0100 |
| commit | 6ee68fa294d1d9ab8fa8e61a009845dc31a9b771 (patch) | |
| tree | 2647e13c34dbffa7827d3c1dfada51a82ba398c9 /include | |
| parent | adbc664125142c434294bfa795666c90c7608429 (diff) | |
| download | libnitrokey-6ee68fa294d1d9ab8fa8e61a009845dc31a9b771.tar.gz libnitrokey-6ee68fa294d1d9ab8fa8e61a009845dc31a9b771.tar.bz2 | |
Compiles on MXE, but not working on Windows
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/device.h | 2 | ||||
| -rw-r--r-- | include/log.h | 4 |
2 files changed, 5 insertions, 1 deletions
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 { |