diff --git a/ldisc.c b/ldisc.c index f097c040..e5e1449d 100644 --- a/ldisc.c +++ b/ldisc.c @@ -11,7 +11,22 @@ #include "putty.h" #include "terminal.h" -#include "ldisc.h" + +struct Ldisc_tag { + Terminal *term; + Backend *backend; + Seat *seat; + + /* + * Values cached out of conf. + */ + bool telnet_keyboard, telnet_newline; + int protocol, localecho, localedit; + + char *buf; + size_t buflen, bufsiz; + bool quotenext; +}; #define ECHOING (ldisc->localecho == FORCE_ON || \ (ldisc->localecho == AUTO && \ diff --git a/ldisc.h b/ldisc.h deleted file mode 100644 index 770b4b05..00000000 --- a/ldisc.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * ldisc.h: defines the Ldisc data structure used by ldisc.c and - * ldiscucs.c. (Unfortunately it was necessary to split the ldisc - * module in two, to avoid unnecessarily linking in the Unicode - * stuff in tools that don't require it.) - */ - -#ifndef PUTTY_LDISC_H -#define PUTTY_LDISC_H - -struct Ldisc_tag { - Terminal *term; - Backend *backend; - Seat *seat; - - /* - * Values cached out of conf. - */ - bool telnet_keyboard, telnet_newline; - int protocol, localecho, localedit; - - char *buf; - size_t buflen, bufsiz; - bool quotenext; -}; - -#endif /* PUTTY_LDISC_H */