Fix Windows and Mac Builds
* missing include for locale_to_utf8 (amend4c6ff5f7e7
) * avoid void* arithemtic (amend103ef2ba
)
This commit is contained in:
parent
df72e1ba4f
commit
d18b247a05
@ -29,6 +29,7 @@
|
|||||||
|
|
||||||
#include "pbd/file_utils.h"
|
#include "pbd/file_utils.h"
|
||||||
|
|
||||||
|
#include <glibmm/convert.h>
|
||||||
#include <glibmm/miscutils.h>
|
#include <glibmm/miscutils.h>
|
||||||
#include <glibmm/fileutils.h>
|
#include <glibmm/fileutils.h>
|
||||||
|
|
||||||
|
@ -601,7 +601,7 @@ SystemExec::write_to_stdin(const void* data, size_t bytes)
|
|||||||
|
|
||||||
c=0;
|
c=0;
|
||||||
while (c < bytes) {
|
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*/) {
|
if (GetLastError() == 0xE8 /*NT_STATUS_INVALID_USER_BUFFER*/) {
|
||||||
Sleep(100);
|
Sleep(100);
|
||||||
continue;
|
continue;
|
||||||
@ -965,7 +965,7 @@ SystemExec::write_to_stdin(const void* data, size_t bytes)
|
|||||||
c=0;
|
c=0;
|
||||||
while (c < bytes) {
|
while (c < bytes) {
|
||||||
for (;;) {
|
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)) {
|
if (r < 0 && (errno == EINTR || errno == EAGAIN)) {
|
||||||
sleep(1);
|
sleep(1);
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user