diff options
| author | David CARLIER <devnexen@gmail.com> | 2020-07-13 14:36:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 14:36:09 +0100 |
| commit | c9c8b88f0bee1bf9e5f2011c67f8b579b6cf68d0 (patch) | |
| tree | ebff8e7163a5d887ecf6467a8df662ce6defafec | |
| parent | fc4334303e042a78b672a2f31c55960958ba14ca (diff) | |
| download | qemu-c9c8b88f0bee1bf9e5f2011c67f8b579b6cf68d0.zip qemu-c9c8b88f0bee1bf9e5f2011c67f8b579b6cf68d0.tar.gz qemu-c9c8b88f0bee1bf9e5f2011c67f8b579b6cf68d0.tar.bz2 | |
util/qemu-openpty.c: Don't assume pty.h is glibc-only
Instead of using an OS-specific ifdef test to select the "openpty()
is in pty.h" codepath, make configure check for the existence of
the header and use the new CONFIG_PTY instead.
This is necessary to build on Haiku, which also provides openpty()
via pty.h.
Signed-off-by: David Carlier <devnexen@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200703145614.16684-3-peter.maydell@linaro.org
[PMM: Expanded commit message; rename to HAVE_PTY_H]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | util/qemu-openpty.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -2402,6 +2402,12 @@ else l2tpv3=no fi +if check_include "pty.h" ; then + pty_h=yes +else + pty_h=no +fi + ######################################### # vhost interdependencies and host support @@ -7893,6 +7899,9 @@ fi if test "$sheepdog" = "yes" ; then echo "CONFIG_SHEEPDOG=y" >> $config_host_mak fi +if test "$pty_h" = "yes" ; then + echo "HAVE_PTY_H=y" >> $config_host_mak +fi if test "$fuzzing" = "yes" ; then if test "$have_fuzzer" = "yes"; then FUZZ_LDFLAGS=" -fsanitize=address,fuzzer" diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 4b8df96..eb17f5b 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#if defined(__GLIBC__) +#if defined HAVE_PTY_H # include <pty.h> #elif defined CONFIG_BSD # include <termios.h> |