diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-06-28 11:57:21 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-06-28 11:57:21 +0200 |
| commit | ab0f01c381c16ed61b8258582869912d4c38cbb7 (patch) | |
| tree | b8935e0008795fee2a487cf4512a93a1abf8e262 /include/stick20_commands.h | |
| parent | 8f7435e4553916e6cc431e4b5316cc5861fd9063 (diff) | |
| download | libnitrokey-ab0f01c381c16ed61b8258582869912d4c38cbb7.tar.gz libnitrokey-ab0f01c381c16ed61b8258582869912d4c38cbb7.tar.bz2 | |
Adjust code to make compilation under MSVC 2017
Diffstat (limited to 'include/stick20_commands.h')
| -rw-r--r-- | include/stick20_commands.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/stick20_commands.h b/include/stick20_commands.h index 5f99d28..64df372 100644 --- a/include/stick20_commands.h +++ b/include/stick20_commands.h @@ -111,7 +111,7 @@ namespace nitrokey { std::string dissect() const { std::stringstream ss; ss << "_padding:" << std::endl - << ::nitrokey::misc::hexdump((const char *) (_padding), + << ::nitrokey::misc::hexdump((const uint8_t *) (_padding), sizeof _padding); print_to_ss((int) SendCounter_u8); print_to_ss((int) SendDataType_u8); @@ -138,9 +138,9 @@ namespace nitrokey { union{ uint8_t VersionInfo_au8[4]; struct { - uint8_t __reserved; + uint8_t _reserved; uint8_t minor; - uint8_t __reserved2; + uint8_t _reserved2; uint8_t major; } __packed versionInfo; } __packed; |