13
0

Fix Windows and Mac Builds

* missing include for locale_to_utf8 (amend 4c6ff5f7e7)
* avoid void* arithemtic (amend 103ef2ba)
This commit is contained in:
Robin Gareus 2018-11-19 12:50:38 +01:00
parent df72e1ba4f
commit d18b247a05
2 changed files with 3 additions and 2 deletions

View File

@ -29,6 +29,7 @@
#include "pbd/file_utils.h"
#include <glibmm/convert.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>

View File

@ -601,7 +601,7 @@ SystemExec::write_to_stdin(const void* data, size_t bytes)
c=0;
while (c < bytes) {
if (!WriteFile(stdinP[1], data+c, bytes-c, &r, NULL)) {
if (!WriteFile(stdinP[1], &((const char*)data)[c], bytes - c, &r, NULL)) {
if (GetLastError() == 0xE8 /*NT_STATUS_INVALID_USER_BUFFER*/) {
Sleep(100);
continue;
@ -965,7 +965,7 @@ SystemExec::write_to_stdin(const void* data, size_t bytes)
c=0;
while (c < bytes) {
for (;;) {
r=::write(pin[1], data+c, bytes-c);
r = ::write(pin[1], &((const char*)data)[c], bytes - c);
if (r < 0 && (errno == EINTR || errno == EAGAIN)) {
sleep(1);
continue;