diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2009-04-01 23:19:04 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2009-04-01 23:19:04 -0600 |
| commit | a43bab0a8ba67598cbb7d5835b115724039cbb07 (patch) | |
| tree | be1e56f77be903da5353e8d4deaee7e8fb0f2adc /cmd-line-utils | |
| parent | f675006950239524d47640363810a661164f24cc (diff) | |
| parent | b70852c2f295a5f71710e27977f353d5aa2a4be9 (diff) | |
| download | mariadb-git-a43bab0a8ba67598cbb7d5835b115724039cbb07.tar.gz | |
merge -5.0 into -5.1 (minor conflicts resolved)
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/readline/readline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-line-utils/libedit/readline/readline.h b/cmd-line-utils/libedit/readline/readline.h index c77b080c439..0e300faed89 100644 --- a/cmd-line-utils/libedit/readline/readline.h +++ b/cmd-line-utils/libedit/readline/readline.h @@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap; #ifndef CTRL #include <sys/ioctl.h> -#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) +#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC__) #include <sys/ttydefaults.h> #endif #ifndef CTRL |