Post-release destabilisation! Completely remove the struct type

[u/mdw/putty] / windows / winx11.c

diff --git a/windows/winx11.c b/windows/winx11.c
index c8951b0..b8c7fa7 100644 (file)
--- a/windows/winx11.c
+++ b/windows/winx11.c
@@ -1,18 +1,19 @@
-/*\r
- * winx11.c: fetch local auth data for X forwarding.\r
- */\r
-\r
-#include <ctype.h>\r
-#include <assert.h>\r
-#include <stdlib.h>\r
-\r
-#include "putty.h"\r
-#include "ssh.h"\r
-\r
-void platform_get_x11_auth(struct X11Display *disp, const Config *cfg)\r
-{\r
-    if (cfg->xauthfile.path[0])\r
-       x11_get_auth_from_authfile(disp, cfg->xauthfile.path);\r
-}\r
-\r
-const int platform_uses_x11_unix_by_default = FALSE;\r
+/*
+ * winx11.c: fetch local auth data for X forwarding.
+ */
+
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#include "putty.h"
+#include "ssh.h"
+
+void platform_get_x11_auth(struct X11Display *disp, Conf *conf)
+{
+    char *xauthpath = conf_get_filename(conf, CONF_xauthfile)->path;
+    if (xauthpath[0])
+       x11_get_auth_from_authfile(disp, xauthpath);
+}
+
+const int platform_uses_x11_unix_by_default = FALSE;