From 3a2afbc9c03010fa62ee7ed622c1d5eb1696c0ab Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 1 Nov 2018 18:17:41 +0000 Subject: [PATCH] Remove duplicate typedef for mainchan. In some compiler modes - notably the one that gtk-config selects when GTK PuTTY is built for GTK 1 - it's an error to typedef the same thing twice. 'mainchan' is defined in defs.h, so it doesn't need defining again where the structure contents are specified. --- mainchan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainchan.c b/mainchan.c index c196da52..a75b44e4 100644 --- a/mainchan.c +++ b/mainchan.c @@ -54,7 +54,7 @@ typedef enum MainChanType { MAINCHAN_SESSION, MAINCHAN_DIRECT_TCPIP } MainChanType; -typedef struct mainchan { +struct mainchan { SshChannel *sc; Conf *conf; PacketProtocolLayer *ppl; @@ -70,7 +70,7 @@ typedef struct mainchan { int term_width, term_height; Channel chan; -} mainchan; +}; mainchan *mainchan_new( PacketProtocolLayer *ppl, ConnectionLayer *cl, Conf *conf,