6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #799 from TomHarte/WindowsBuildErrors

Browse Source 
Fixes a couple of Windows build errors.
This commit is contained in:
Thomas Harte 2020-05-27 21:42:06 -04:00 committed by GitHub
commit 743353a0ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Outputs/OpenGL/OpenGL.hpp
View File

@ -23,6 +23,7 @@
#else
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glext.h>
#endif
#ifndef NDEBUG

12
Storage/MassStorage/SCSI/Target.hpp
View File

@ -278,12 +278,12 @@ struct Executor {
};
auto copy_string = [] (uint8_t *destination, const char *source, size_t length) -> void {
// Copy as much of the string as will fit, and pad with spaces.
uint8_t *end = reinterpret_cast<uint8_t *>(stpncpy(reinterpret_cast<char *>(destination), source, length));
while(end < destination + length) {
*end = ' ';
++end;
}
// Determine length of source and copy in as much as possible.
const auto source_length = std::min(strlen(source), length);
memcpy(destination, source, source_length);
// Fill the rest with spaces.
memset(&destination[source_length], ' ', length - source_length);
};
copy_string(&response[8], inq.vendor_identifier, 8);
copy_string(&response[16], inq.product_identifier, 16);