diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-06-19 12:49:30 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-19 12:49:30 -0500 |
| commit | 61f3916b4ae51480b783a4f137f7456b4731b2b9 (patch) | |
| tree | fd0b1aade307f604989e911299bbab4ec5a906b5 /src | |
| parent | Merge pull request #3835 (diff) | |
| parent | Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (diff) | |
| download | monero-61f3916b4ae51480b783a4f137f7456b4731b2b9.tar.xz | |
Merge pull request #3844
bdf5a3a Fix PCSC compilation under windows (cslashm)
f17383a Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/device_ledger.cpp | 9 | ||||
| -rw-r--r-- | src/device/device_ledger.hpp | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp index 3b9ab6744..aedaf8382 100644 --- a/src/device/device_ledger.cpp +++ b/src/device/device_ledger.cpp @@ -48,6 +48,15 @@ namespace hw { /* ===================================================================== */ /* === Debug ==== */ /* ===================================================================== */ + #ifdef WIN32 + static char *pcsc_stringify_error(LONG rv) { + static __thread char out[20]; + sprintf_s(out, sizeof(out), "0x%08lX", rv); + + return out; + } + #endif + void set_apdu_verbose(bool verbose) { apdu_verbose = verbose; } diff --git a/src/device/device_ledger.hpp b/src/device/device_ledger.hpp index f1fcaab87..b62bdf959 100644 --- a/src/device/device_ledger.hpp +++ b/src/device/device_ledger.hpp @@ -33,8 +33,13 @@ #include <cstddef> #include <string> #include "device.hpp" +#ifdef WIN32 +#include <winscard.h> +#define MAX_ATR_SIZE 33 +#else #include <PCSC/winscard.h> #include <PCSC/wintypes.h> +#endif #include <boost/thread/mutex.hpp> #include <boost/thread/recursive_mutex.hpp> |