Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -175,6 +175,11 @@ discard_buffer (int fd, gboolean input)
gint32
get_bytes_in_buffer (int fd, gboolean input)
{
#if defined(__HAIKU__)
/* FIXME: Haiku doesn't support TIOCOUTQ nor FIONREAD on fds */
return -1;
#define TIOCOUTQ 0
#endif
gint32 retval;
if (ioctl (fd, input ? FIONREAD : TIOCOUTQ, &retval) == -1) {