diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /cad/magic/files/patch-textio__textioInt.h | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'cad/magic/files/patch-textio__textioInt.h')
| -rw-r--r-- | cad/magic/files/patch-textio__textioInt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cad/magic/files/patch-textio__textioInt.h b/cad/magic/files/patch-textio__textioInt.h index e7745fdfc40b..9c35955bf95d 100644 --- a/cad/magic/files/patch-textio__textioInt.h +++ b/cad/magic/files/patch-textio__textioInt.h @@ -1,4 +1,4 @@ ---- textio/textioInt.h.orig 2025-02-24 07:00:02 UTC +--- textio/textioInt.h.orig 2025-07-30 06:00:02 UTC +++ textio/textioInt.h @@ -43,7 +43,7 @@ typedef struct { #define TX_CMD_PROMPT ":" @@ -6,6 +6,6 @@ /* all of the state associated with a tty terminal */ -#if !defined(SYSV) && !defined(CYGWIN) && !defined(__OpenBSD__) && !defined(EMSCRIPTEN) +#if !defined(SYSV) && !defined(CYGWIN) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(EMSCRIPTEN) - typedef struct { - struct sgttyb tx_i_sgtty; - struct tchars tx_i_tchars; + #if defined(HAVE_SYS_IOCTL_COMPAT_H) || defined(HAVE_SGTTY_H) + #if defined(HAVE_SYS_IOCTL_COMPAT_H) + #include <sys/ioctl_compat.h> /* replaced sgtty.h */ |