Control: tags -1 patch Hi,
In Ubuntu, the attached patch was applied to achieve the following: * Fix FTBFS with GCC 10 due to multiple definitions. Thanks for considering the patch. Logan
diff -Nru cyclades-serial-client-0.93ubuntu2/inc/dev.h cyclades-serial-client-0.93ubuntu3/inc/dev.h --- cyclades-serial-client-0.93ubuntu2/inc/dev.h 2003-08-05 00:25:11.000000000 -0400 +++ cyclades-serial-client-0.93ubuntu3/inc/dev.h 2021-01-19 23:13:52.000000000 -0500 @@ -47,12 +47,12 @@ /* handle for pty slave */ EXTERN int P_sfd; /* handle for control socket listener */ -EXTERN int P_contr_listen; +extern int P_contr_listen; /* handle for control socket */ #define MAX_CONTROL_SOCKS 32 -EXTERN int P_contr[MAX_CONTROL_SOCKS]; +extern int P_contr[MAX_CONTROL_SOCKS]; /* struct for port information */ -EXTERN struct comport Comport; +extern struct comport Comport; /* device name */ EXTERN char P_devname[NAMESIZE]; /* control socket name */ diff -Nru cyclades-serial-client-0.93ubuntu2/inc/telnet.h cyclades-serial-client-0.93ubuntu3/inc/telnet.h --- cyclades-serial-client-0.93ubuntu2/inc/telnet.h 2003-07-25 08:25:09.000000000 -0400 +++ cyclades-serial-client-0.93ubuntu3/inc/telnet.h 2021-01-19 23:11:37.000000000 -0500 @@ -42,7 +42,7 @@ # define NVT_NUMOPTS 256 -int NvtOptions[NVT_NUMOPTS]; +extern int NvtOptions[NVT_NUMOPTS]; # define I_WILL 0x01 /* I desire to support it */ # define I_DO 0x02 /* I do support it */ @@ -123,7 +123,7 @@ * State control of NVT Com Port Commands */ -int CmdState[NUM_COMCMDS]; +extern int CmdState[NUM_COMCMDS]; # define CMD_INACTIVE 0 # define CMD_ACTIVE 1 diff -Nru cyclades-serial-client-0.93ubuntu2/inc/tsrio.h cyclades-serial-client-0.93ubuntu3/inc/tsrio.h --- cyclades-serial-client-0.93ubuntu2/inc/tsrio.h 2003-07-25 08:24:37.000000000 -0400 +++ cyclades-serial-client-0.93ubuntu3/inc/tsrio.h 2021-01-19 23:10:50.000000000 -0500 @@ -273,9 +273,9 @@ # define MAX_EVENTS 20 # define EVENT_PARAMSZ 128 -struct event Eventpoll[MAX_EVENTS]; +extern struct event Eventpoll[MAX_EVENTS]; -struct event Evhead; +extern struct event Evhead; # define INIT_EVENTS() Evhead.ev_last = Evhead.ev_next = &Evhead; diff -Nru cyclades-serial-client-0.93ubuntu2/telnet.c cyclades-serial-client-0.93ubuntu3/telnet.c --- cyclades-serial-client-0.93ubuntu2/telnet.c 2003-07-25 08:25:49.000000000 -0400 +++ cyclades-serial-client-0.93ubuntu3/telnet.c 2021-01-19 23:11:29.000000000 -0500 @@ -79,6 +79,10 @@ unsigned char Comibuf[SOCK_MAXIOSZ]; unsigned char Comobuf[SOCK_MAXIOSZ]; +int NvtOptions[NVT_NUMOPTS]; + +int CmdState[NUM_COMCMDS]; + /* * Telnet Protocol Access Routines */ diff -Nru cyclades-serial-client-0.93ubuntu2/tsrio.c cyclades-serial-client-0.93ubuntu3/tsrio.c --- cyclades-serial-client-0.93ubuntu2/tsrio.c 2003-07-25 08:24:08.000000000 -0400 +++ cyclades-serial-client-0.93ubuntu3/tsrio.c 2021-01-19 23:10:46.000000000 -0500 @@ -90,6 +90,10 @@ "EV_RNWROK", }; +struct event Eventpoll[MAX_EVENTS]; + +struct event Evhead; + /* * Main Scheduler Routines */
