X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/df7c7e52e8be2b65dbfc4ffc49ccf6b0c6c42b76..f08a390fab250d5d200b3fbdc531916f388a0ef3:/unix/uxpterm.c

diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index c20c14a2..6542fbba 100644
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -12,19 +12,29 @@ const int use_event_log = 0;	       /* pterm doesn't need it */
 const int new_session = 0, saved_sessions = 0;   /* or these */
 const int use_pty_argv = TRUE;
 
-Backend *select_backend(Config *cfg)
+Backend *select_backend(Conf *conf)
 {
     return &pty_backend;
 }
 
-int cfgbox(Config *cfg)
+void net_pending_errors(void)
+{
+    /*
+     * Stub version of net_pending_errors(), because gtkwin.c has to
+     * be prepared to call it when linked into PuTTY and therefore we
+     * have to avoid a link failure when linking gtkwin.c in turn into
+     * a non-networked application.
+     */
+}
+
+int cfgbox(Conf *conf)
 {
     /*
      * This is a no-op in pterm, except that we'll ensure the
      * protocol is set to -1 to inhibit the useless Connection
      * panel in the config box.
      */
-    cfg->protocol = -1;
+    conf_set_int(conf, CONF_protocol, -1);
     return 1;
 }
 
@@ -33,7 +43,7 @@ void cleanup_exit(int code)
     exit(code);
 }
 
-int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
+int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch)
 {
     return 0;                          /* pterm doesn't have any. */
 }
@@ -47,11 +57,14 @@ int main(int argc, char **argv)
 {
     extern int pt_main(int argc, char **argv);
     extern void pty_pre_init(void);    /* declared in pty.c */
+    int ret;
 
     cmdline_tooltype = TOOLTYPE_NONNETWORK;
     default_protocol = -1;
 
     pty_pre_init();
 
-    return pt_main(argc, argv);
+    ret = pt_main(argc, argv);
+    cleanup_exit(ret);
+    return ret;             /* not reached, but placates optimisers */
 }