diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-09 23:36:27 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-09 23:36:27 +0300 |
commit | b5be0ef0b188ab5afeef825d80a0b00bfff30023 (patch) | |
tree | 944e856124551c83e39fb8b520da0cb4063c763f /utils/adlmidi-2/input.cc | |
parent | 3f8560af1584965706e2b4ec5614212f5653f34c (diff) | |
parent | 58dd9b34bff3110392a05e952885057433b60559 (diff) | |
download | libADLMIDI-b5be0ef0b188ab5afeef825d80a0b00bfff30023.tar.gz libADLMIDI-b5be0ef0b188ab5afeef825d80a0b00bfff30023.tar.bz2 libADLMIDI-b5be0ef0b188ab5afeef825d80a0b00bfff30023.zip |
Merge branch 'master' into get-rid-of-backup-buffer
# Conflicts:
# src/adlmidi.cpp
Diffstat (limited to 'utils/adlmidi-2/input.cc')
-rw-r--r-- | utils/adlmidi-2/input.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/adlmidi-2/input.cc b/utils/adlmidi-2/input.cc index 9d69469..bb276cb 100644 --- a/utils/adlmidi-2/input.cc +++ b/utils/adlmidi-2/input.cc @@ -5,7 +5,7 @@ xInput::xInput() #ifdef _WIN32 inhandle = GetStdHandle(STD_INPUT_HANDLE); #endif -#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) +#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__) ioctl(0, TCGETA, &back); struct termio term = back; term.c_lflag &= ~(ICANON | ECHO); @@ -17,7 +17,7 @@ xInput::xInput() xInput::~xInput() { -#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) +#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__) if(ioctl(0, TCSETA, &back) < 0) fcntl(0, F_SETFL, fcntl(0, F_GETFL) & ~ O_NONBLOCK); #endif |