diff options
| author | Thomas Huth <thuth@redhat.com> | 2020-06-29 14:13:24 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2020-07-06 07:37:02 +0200 |
| commit | 9df8b20d1632d108da316134d4d86a00b4028803 (patch) | |
| tree | 8439f13b2b5ddbf3e01bbdd1a0245e341d317916 /util/qemu-openpty.c | |
| parent | 51b3ca97592964a0ece22f9df92592e0f80a78fe (diff) | |
| download | qemu-9df8b20d1632d108da316134d4d86a00b4028803.zip | |
configure / util: Auto-detect the availability of openpty()
Recent versions of Solaris (v11.4) now feature an openpty() function,
too, causing a build failure since we ship our own implementation of
openpty() for Solaris in util/qemu-openpty.c so far. Since there are
now both variants available in the wild, with and without this function
(and illumos is said to not have this function yet), let's introduce a
proper HAVE_OPENPTY define for this to fix the build failure.
Message-Id: <20200702143955.678-1-thuth@redhat.com>
Tested-by: Michele Denber <denber@mindspring.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'util/qemu-openpty.c')
| -rw-r--r-- | util/qemu-openpty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 2e8b43bdf5..4b8df96f38 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -52,7 +52,9 @@ #endif #ifdef __sun__ -/* Once Solaris has openpty(), this is going to be removed. */ + +#if !defined(HAVE_OPENPTY) +/* Once illumos has openpty(), this is going to be removed. */ static int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { @@ -93,6 +95,7 @@ err: close(mfd); return -1; } +#endif static void cfmakeraw (struct termios *termios_p) { |